Commit b3575462 authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 1.5.0~rc1

parent 4fc8ab53
......@@ -18,8 +18,8 @@ SET(CMAKE_COLOR_MAKEFILE ON)
# Version information
set(PROJECT_VERSION_MAJOR 1)
set(PROJECT_VERSION_MINOR 4)
set(PROJECT_VERSION_PATCH 3)
set(PROJECT_VERSION_MINOR 5)
set(PROJECT_VERSION_PATCH 0)
set(PROJECT_VERSION
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
set(GeoTIFF_VERSION ${PROJECT_VERSION})
......@@ -28,8 +28,8 @@ set(GeoTIFF_VERSION ${PROJECT_VERSION})
# libgeotiff.so -> libgeotiff.so.2.2.0
# libgeotiff.so.2 -> libgeotiff.so.2.2.0
# libgeotiff.so.2.2.0
set(LINK_SOVERSION "2")
set(LINK_VERSION "2.2.0")
set(LINK_SOVERSION "5")
set(LINK_VERSION "5.0.0")
string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
......@@ -111,19 +111,6 @@ CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)
###############################################################################
# User-defined build settings
SET(GEOTIFF_CSV_NAMES area.csv codes.csv datum.csv gcs.csv pcs.csv)
FIND_PATH(GEOTIFF_CSV_DATA_DIR NAMES ${GEOTIFF_CSV_NAMES}
PATHS "${CMAKE_SOURCE_DIR}/csv"
DOC "Default location of GeoTIFF CSV files"
NO_DEFAULT_PATH)
IF(IS_DIRECTORY ${GEOTIFF_CSV_DATA_DIR} AND EXISTS "${GEOTIFF_CSV_DATA_DIR}/gcs.csv")
MESSAGE(STATUS "Found GeoTIFF CSV files in: ${GEOTIFF_CSV_DATA_DIR}")
ADD_DEFINITIONS(-DCSV_DATA_DIR="${GEOTIFF_CSV_DATA_DIR}")
ELSE()
MESSAGE(FATAL_ERROR "Failed to find GeoTIFF CSV files in: ${GEOTIFF_CSV_DATA_DIR}")
ENDIF()
SET(WITH_UTILITIES TRUE CACHE BOOL "Choose if GeoTIFF utilities should be built")
###############################################################################
......@@ -135,19 +122,15 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/libxtiff)
# TIFF support - required, default=ON
SET(WITH_TIFF TRUE CACHE BOOL "Choose if TIFF support should be built")
# PROJ.4 support - optional, default=ON
SET(WITH_PROJ4 TRUE CACHE BOOL "Choose if PROJ.4 support should be built")
IF(WITH_PROJ4)
FIND_PACKAGE(PROJ4 NO_MODULE QUIET)
if (NOT PROJ4_FOUND)
FIND_PACKAGE(PROJ4)
endif ()
FIND_PACKAGE(PROJ NO_MODULE QUIET)
if (NOT PROJ_FOUND)
FIND_PACKAGE(PROJ)
endif ()
IF(PROJ4_FOUND)
ADD_DEFINITIONS(-DHAVE_LIBPROJ=1)
INCLUDE_DIRECTORIES(${PROJ4_INCLUDE_DIR})
ENDIF()
IF(PROJ_FOUND)
INCLUDE_DIRECTORIES(${PROJ_INCLUDE_DIR})
ELSE()
MESSAGE(FATAL_ERROR "Failed to detect PROJ >= 6")
ENDIF()
# Zlib support - optional, default=OFF
......@@ -231,41 +214,6 @@ MESSAGE(STATUS "Generating geo_config.h header - done")
###############################################################################
# Installation settings
SET(GEOTIFF_CSV_DATA
csv/alias.csv
csv/area.csv
csv/change.csv
csv/compdcs.csv
csv/coordinate_axis.csv
csv/coordinate_axis_name.csv
csv/coordinate_operation.csv
csv/coordinate_operation_method.csv
csv/coordinate_operation_parameter.csv
csv/coordinate_operation_parameter_value.csv
csv/coordinate_operation_path.csv
csv/coordinate_reference_system.csv
csv/coordinate_system.csv
csv/datum.csv
csv/datum_shift.csv
csv/datum_shift_pref.csv
csv/deprecation.csv
csv/ellipsoid.csv
csv/esri_datum_override.csv
csv/gcs.csv
csv/gcs.override.csv
csv/geoccs.csv
csv/naming_system.csv
csv/pcs.csv
csv/pcs.override.csv
csv/prime_meridian.csv
csv/projop_wparm.csv
csv/stateplane.csv
csv/supersession.csv
csv/unit_of_measure.csv
csv/version_history.csv
csv/vertcs.csv
csv/vertcs.override.csv )
SET(GEOTIFF_LIB_HEADERS
geotiff.h
geotiffio.h
......@@ -341,10 +289,6 @@ INSTALL(FILES
DESTINATION doc)
# DESTINATION ${GEOTIFF_DATA_DIR}/doc)
# Install CSV data files
# INSTALL(FILES ${GEOTIFF_CSV_DATA} DESTINATION ${GEOTIFF_DATA_DIR}/epsg_csv)
INSTALL(FILES ${GEOTIFF_CSV_DATA} DESTINATION share/epsg_csv)
# Install man pages
INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)
......@@ -363,7 +307,6 @@ ADD_SUBDIRECTORY(libxtiff)
SET(GEOTIFF_LIB_SOURCES
cpl_serv.c
cpl_csv.c
geo_extra.c
geo_free.c
geo_get.c
......@@ -378,41 +321,6 @@ SET(GEOTIFF_LIB_SOURCES
geo_write.c
geotiff_proj4.c)
SET(INCODE_EPSG_FROM_CSV FALSE CACHE BOOL "Build source-encoded EPSG data files")
FOREACH(epsg_csv_file ${GEOTIFF_CSV_DATA})
# We cannot use NAME_WE without string-replace, because that would
# give "gcs.csv" and "gcs.override.csv" the same epsg_csv_name
GET_FILENAME_COMPONENT(epsg_csv_name "${epsg_csv_file}" NAME)
STRING(REPLACE ".csv" "" epsg_csv_basename "${epsg_csv_name}")
# SET(INCODE_EPSG_FROM_CSV_${epsg_csv_basename} FALSE CACHE BOOL "Build ${epsg_csv_basename} file target")
# IF(INCODE_EPSG_FROM_CSV_${epsg_csv_basename})
if( INCODE_EPSG_FROM_CSV)
SET(epsg_source_name "${CMAKE_CURRENT_BINARY_DIR}/incode_epsg_${epsg_csv_basename}.c")
LIST(APPEND GEOTIFF_LIB_CSV_SOURCES "${epsg_source_name}")
# sanitize .'s out of struct names
STRING(REGEX REPLACE "\\." "_" STRUCT_NAME ${epsg_csv_basename})
LIST(APPEND epsg_includefile_externconst "\nextern const datafile_rows_t *${STRUCT_NAME}_rows[]")
LIST(APPEND epsg_includefile_pointer_list " { \"${STRUCT_NAME}\", ${STRUCT_NAME}_rows },")
MESSAGE(STATUS "Creating buildrule to convert ${epsg_csv_basename}.csv to ${epsg_csv_basename}.c and include it in code.")
ADD_CUSTOM_COMMAND(OUTPUT "${epsg_source_name}"
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/csv/csv2c.py" "${CMAKE_CURRENT_SOURCE_DIR}/${epsg_csv_file}" "${epsg_source_name}"
DEPENDS "${epsg_csv_file}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
VERBATIM)
ENDIF()
ENDFOREACH()
SET(EPSG_INCODE_EXPLANATION
"This file is autogenerated by CMake, based on the INCODE_EPSG_* options specified during configure.\n
Choosing an EPSG CSV file for inclusion into code will run csv/csv2c.py on the file and include the\n
resulting c-source as a build target, as opposed to using GDAL_DATA-dir to find the EPSG codes at runtime.")
STRING(REPLACE ";" "\n" EPSG_INCLUDEFILE_POINTER_STRING "${epsg_includefile_pointer_list}")
FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/epsg_incode_header.h"
"/* ${EPSG_INCODE_EXPLANATION} */\n${epsg_includefile_externconst}; \n\n/* Pointers to csv data included in code */\nstatic const datafile_t files[] = {\n${EPSG_INCLUDEFILE_POINTER_STRING}\n { NULL, NULL }};")
SET(XTIFF_SOURCES libxtiff/xtiff.c)
if (MSVC OR CMAKE_CONFIGURATION_TYPES)
......@@ -422,7 +330,11 @@ if (MSVC OR CMAKE_CONFIGURATION_TYPES)
endif ()
ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET}
${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES} ${XTIFF_SOURCES})
${GEOTIFF_LIB_SOURCES} ${XTIFF_SOURCES})
IF(WIN32 AND MSVC)
SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES IMPORT_SUFFIX "_i.lib")
ENDIF(WIN32 AND MSVC)
# Unix, linux:
IF(UNIX)
......@@ -451,7 +363,7 @@ SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
TARGET_LINK_LIBRARIES(${GEOTIFF_LIBRARY_TARGET}
${TIFF_LIBRARIES}
${PROJ4_LIBRARIES}
${PROJ_LIBRARIES}
${ZLIB_LIBRARIES}
${JPEG_LIBRARIES})
......
Changelog entries are no longer updated. Use git history for detailed changes
2018-12-11 Even Rouault <even dot rouault at spatialys dot com>
* geo_print.c: fix wrong test in DefaultRead() that caused erroenous
......
......@@ -6,8 +6,7 @@ All the source code in this toolkit are either in the public domain, or under
an X style license. In any event it is all considered to be free to use
for any purpose (including commercial software). No credit is required
though some of the code requires that the specific source code modules
retain their existing copyright statements. The CSV files, and other tables
derived from the EPSG coordinate system database are also free to use. In
retain their existing copyright statements. In
particular, no part of this code is "copyleft", nor does it imply any
requirement for users to disclose this or their own source code.
......@@ -51,48 +50,6 @@ Code by Niles Ritter is under this licence:
* Permission granted to use this software, so long as this copyright
* notice accompanies any products derived therefrom.
-----------
The EPSG Tables (from which the CSV files, and .inc files are derived)
carried this statement on use of the data (from the EPSG web site):
Use of the Data
The user assumes the entire risk as to the accuracy and the use of this
data. The data may be used, copied and distributed subject to the following
conditions:
1. INFORMATION PROVIDED IN THIS DOCUMENT IS PROVIDED "AS IS"
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
2. The data may be included in any commercial package provided that any
commerciality is based on value added by the provider and not on a value
ascribed to the EPSG dataset which is made available at no charge. The
ownership of the EPSG dataset [OGP] must be acknowledged.
3. Subsets of information may be extracted from the dataset. Users are
advised that coordinate reference system and coordinate transformation
descriptions are incomplete unless all elements detailed as essential
in OGP Surveying and Positioning Guidance Note 7-1 annex F are included.
4. Essential elements should preferably be reproduced as described in the
dataset. Modification of parameter values is permitted as described in
the table below to allow change to the content of the information provided
that numeric equivalence is achieved. Numeric equivalence refers to the
results of geodetic calculations in which the parameters are used, for
example (i) conversion of ellipsoid defining parameters, or (ii) conversion
of parameters between one and two standard parallel projection methods,
or (iii) conversion of parameters between 7-parameter geocentric
transformation methods.
(EPSG provides a table at this point with some details)
5. No data that has been modified other than as permitted in these terms
and conditions shall be described as or attributed to the EPSG dataset.
----------
The cmake/*.cmake macros are under the following BSD license. This does
......
SUBDIRS = libxtiff . bin man cmake
SUBDIRS = libxtiff . bin man cmake test
AUTOMAKE_OPTIONS = dist-zip subdir-objects
ACLOCAL_AMFLAGS = -I m4
include $(top_srcdir)/m4/doxygen.am
PROJ_CFLAGS=
if PROJ_IS_CONFIG
PROJ_CFLAGS += @PROJ_INC@ -DHAVE_LIBPROJ=1
endif
if PROJECTS_H_IS_CONFIG
PROJ_CFLAGS += -DHAVE_PROJECTS_H=1
endif
PROJ_CFLAGS= @PROJ_INCLUDE@
if TIFF_IS_CONFIG
TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
endif
AM_CFLAGS = -I./libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS) \
-DCSV_DATA_DIR=\"$(datadir)/epsg_csv\"
csvdir = $(datadir)/epsg_csv
dist_csv_DATA = csv/alias.csv \
csv/area.csv \
csv/change.csv \
csv/compdcs.csv \
csv/coordinate_axis.csv \
csv/coordinate_axis_name.csv \
csv/coordinate_operation.csv \
csv/coordinate_operation_method.csv \
csv/coordinate_operation_parameter.csv \
csv/coordinate_operation_parameter_value.csv \
csv/coordinate_operation_path.csv \
csv/coordinate_reference_system.csv \
csv/coordinate_system.csv \
csv/csv2c.py \
csv/csv_tools.py \
csv/datum.csv \
csv/datum_shift.csv \
csv/datum_shift_pref.csv \
csv/deprecation.csv \
csv/ellipsoid.csv \
csv/esri_datum_override.csv \
csv/gcs.csv \
csv/gcs.override.csv \
csv/geoccs.csv \
csv/naming_system.csv \
csv/pcs.csv \
csv/pcs.override.csv \
csv/prime_meridian.csv \
csv/projop_wparm.csv \
csv/stateplane.csv \
csv/supersession.csv \
csv/unit_of_measure.csv \
csv/version_history.csv \
csv/vertcs.csv \
csv/vertcs.override.csv
AM_CFLAGS = -I./libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
include_HEADERS = geotiff.h \
geotiffio.h \
......@@ -78,13 +32,11 @@ include_HEADERS = geotiff.h \
epsg_pcs.inc \
epsg_proj.inc \
epsg_vertcs.inc \
geokeys.inc \
geo_incode_defs.h
geokeys.inc
nodist_include_HEADERS = geo_config.h
libgeotiff_la_SOURCES = cpl_serv.c \
cpl_csv.c \
geo_extra.c \
geo_free.c \
geo_get.c \
......@@ -100,17 +52,7 @@ libgeotiff_la_SOURCES = cpl_serv.c \
geo_strtod.c \
geotiff_proj4.c
if CSV_IS_CONFIG
libgeotiff_la_SOURCES += csv/datum.c \
csv/ellipsoid.c \
csv/gcs.c \
csv/pcs.c \
csv/prime_meridian.c \
csv/projop_wparm.c \
csv/unit_of_measure.c
endif
libgeotiff_la_LDFLAGS = -version-info 4:0:2
libgeotiff_la_LDFLAGS = -version-info 5:0:0
libgeotiff_la_LIBADD = libxtiff/libxtiff.la
......
This diff is collapsed.
libgeotiff 1.5.0
----------------
* Require PROJ >= 6 dependency
* Remove all CSV files used by geo_normalize API, since libgeotiff now relies
on PROJ database for EPSG CRS definitions.
* geo_normalize.c: SetGTParmIds(): use ProjStraightVertPoleLongGeoKey for CT_PolarStereographic
* geo_normalize.c: report StdParallel1 for Mercator_2SP when a PCS code is used
* geo_normalize.c: fix support for Laborde Oblique Mercator
* listgeo: use PROJ database to display non-hardcoded values of a number of keys
......@@ -21,10 +21,18 @@ package for reading and writing TIFF files has been installed, with
the development kit (include files). The latest version of libtiff may
be found at:
http://www.remotesensing.org/libtiff
http://www.simplesystems.org/libtiff/
For this build to work you must use libtiff version v3.6.0 alpha or newer.
Use of PROJ
-----------
PROJ 6 or later is a required dependency of libgeotiff 1.5 or later.
The latest version of PROJ can be found at
https://proj4.org/
Building LIBGEOTIFF:
--------------------
......@@ -33,7 +41,7 @@ Assuming that whatever TIFF library you use has been built, and installed
may now build the rest of the geotiff library with:
% cd libgeotiff
% ./configure
% ./configure --with-proj=/contrib/proj-6
% make
Common Configuration Issues:
......@@ -73,27 +81,6 @@ Common Configuration Issues:
% make clean
% make
o If you want to use EPSG tables compiled into the code, use the
--enable-incode-epsg configure switch. It will make the library and
resulting executables substantially larger (~600K), but will avoid any
configuration issues with finding the .csv files.
% rm config.status
% ./configure --enable-incode-epsg
% make clean
% make
o If you want to build in support for the PROJ.4 library, so that listgeo
can report corner coordinates in lat/long, it may be necessary to
specify the directory containing the libproj include files, and library.
(PROJ.4 can also be disabled by passing --without-proj). PROJ.4 info
can be found at http://www.remotesensing.org/proj .
% rm config.status
% ./configure --with-proj=/contrib/proj-4.4.1
% make clean
% make
o The logic to build shared libraries is pretty weak, and is likely to
only work on systems with the GNU tool chain (gcc, and ld) installed.
On other systems you can try hacking on Makefile after running configure.
......@@ -128,12 +115,6 @@ to copy the TIFF file newgeo.tif to newer.tif, using the
GeoTIFF metadata as stored in "metadata.txt". See "docs/manual.txt"
for further uses of geotifcp.
To use the new normalization capability of listgeo, the program needs
to be able to find the CSV files. Use something like the following,
but indicating the correct path to the CSV directory (libgeotiff/csv).
% bin/listgeo -t csv -norm newgeo.tif
To convert a projection metafile, an ESRI world file, and a raw TIFF file
into a GeoTIFF file do something like the following:
......@@ -165,13 +146,6 @@ Credits
o This library was originally written by Niles Ritter (also the primary
author of the GeoTIFF specification).
o It is currently being maintained by Frank Warmerdam (warmerdam@pobox.com),
who also added the "normalization" capability of GTIFGetDefn() using
EPSG CSV files.
o Support for "incode" CSV files was submitted by Derrick J Brashear
<shadow@dementia.org>.
o Eric Brown of Universal Systems, who contributed a bug fix to
GTIFPCSToImage().
......
......@@ -15,17 +15,11 @@ lib/libgeotiff.a: static library for libgeotiff, applications also have
lib/libgeotiff-$VERSION.so: Shared library version of the above.
lib/libgeotiff.so: link to the specific shared library.
include: The include files for libgeotiff.
share/epsg_csv: The EPSG CSV files used to decompose projection systems.
This distribution is intended to be suitable to untar directly under
/usr/local or /usr to give a rough equivelent to having done a "make install"
from the libgeotiff source, though this README should be removed.
If this distribution is not installed under /usr/local, it will likely be
necessary to define the GEOTIFF_CSV environment variable to point at
the share/epsg_csv directory. For reporting of lat/long equivelents of
User documentation for listgeo and geotifcp can be found at:
http://www.remotesensing.org/geotiff/listgeo.html
......
......@@ -12,7 +12,7 @@ if TIFF_IS_CONFIG
TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
endif
AM_CFLAGS = -I../ -I../libxtiff $(TIFF_CFLAGS)
AM_CFLAGS = -I../ -I../libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
LDADD = ../libgeotiff.la
......
......@@ -202,10 +202,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -244,7 +240,6 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
HAVE_LIBPROJ = @HAVE_LIBPROJ@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
......@@ -279,7 +274,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PROJ_INC = @PROJ_INC@
PROJ_INCLUDE = @PROJ_INCLUDE@
RANLIB = @RANLIB@
RELEASE_VERSION = @RELEASE_VERSION@
SED = @SED@
......@@ -297,7 +292,6 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
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@
......@@ -350,7 +344,7 @@ geotifcp_SOURCES = geotifcp.c
listgeo_SOURCES = listgeo.c
applygeo_SOURCES = applygeo.c
@TIFF_IS_CONFIG_TRUE@TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
AM_CFLAGS = -I../ -I../libxtiff $(TIFF_CFLAGS)
AM_CFLAGS = -I../ -I../libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
LDADD = ../libgeotiff.la
EXTRA_DIST = getopt.c
all: all-am
......
......@@ -80,6 +80,12 @@ main(int argc, char *argv[])
char *geofile;
char *tiffile;
int rc;
if( argc != 3 )
{
fprintf(stderr, usage, "applygeo");
exit(1);
}
prog = argv[0];
geofile = argv[1];
......
......@@ -741,7 +741,7 @@ DECLAREcpFunc(cpContig2ContigByRow_8_to_4)
printf( "Downsample\n" );
(void) imagewidth; (void) spp;
(void) spp;
for (row = 0; row < imagelength; row++) {
int i_in, i_out_byte;
......@@ -749,7 +749,7 @@ DECLAREcpFunc(cpContig2ContigByRow_8_to_4)
goto done;
for( i_in = 0, i_out_byte = 0;
i_in < imagewidth;
(unsigned)i_in < imagewidth;
i_in += 2, i_out_byte++ )
{
buf_out[i_out_byte] =
......
......@@ -17,8 +17,6 @@
static void WriteTFWFile( GTIF * gtif, const char * tif_filename );
static void GTIFPrintCorners( GTIF *, GTIFDefn *, FILE *, int, int, int, int );
static const char *CSVFileOverride( const char * );
static const char *CSVDirName = NULL;
static TIFF *st_setup_test_info();
void Usage()
......@@ -53,11 +51,6 @@ int main(int argc, char *argv[])
{
if( strcmp(argv[i],"-no_norm") == 0 )
norm_print_flag = 0;
else if( strcmp(argv[i],"-t") == 0 )
{
CSVDirName = argv[++i];
SetCSVFilenameHook( CSVFileOverride );
}
else if( strcmp(argv[i],"-tfw") == 0 )
tfw_flag = 1;
else if( strcmp(argv[i],"-proj4") == 0 )
......@@ -128,7 +121,7 @@ int main(int argc, char *argv[])
int xsize, ysize;
printf( "\n" );
GTIFPrintDefn( &defn, stdout );
GTIFPrintDefnEx( gtif, &defn, stdout );
if( proj4_print_flag )
{
......@@ -149,31 +142,15 @@ int main(int argc, char *argv[])
ST_Destroy( (ST_TIFF *) tif );
else
XTIFFClose(tif);
GTIFDeaccessCSV();
return 0;
failure:
fprintf(stderr,"failure in listgeo\n");
if (tif) XTIFFClose(tif);
if (gtif) GTIFFree(gtif);
GTIFDeaccessCSV();
return 1;
}
static const char *CSVFileOverride( const char * pszInput )
{
static char szPath[1024];
#ifdef WIN32
sprintf( szPath, "%s\\%s", CSVDirName, pszInput );
#else
sprintf( szPath, "%s/%s", CSVDirName, pszInput );
#endif
return( szPath );
}
/*
* Report the file(s) corner coordinates in projected coordinates, and
* if possible lat/long.
......
###############################################################################
# CMake module to search for PROJ.4 library
# CMake module to search for PROJ library
#
# On success, the macro sets the following variables:
# PROJ4_FOUND = if the library found
# PROJ4_LIBRARY = full path to the library
# PROJ4_INCLUDE_DIR = where to find the library headers
# PROJ_FOUND = if the library found
# PROJ_LIBRARY = full path to the library
# PROJ_INCLUDE_DIR = where to find the library headers
# also defined, but not for general use are
# PROJ4_LIBRARY, where to find the PROJ.4 library.
# PROJ_LIBRARY, where to find the PROJ library.
#
# Copyright (c) 2009 Mateusz Loskot <mateusz@loskot.net>
#
......@@ -24,21 +24,21 @@ IF(WIN32)
ENDIF()
ENDIF(WIN32)
FIND_PATH(PROJ4_INCLUDE_DIR proj_api.h
PATHS ${PROJ4_OSGEO4W_HOME}/include
DOC "Path to PROJ.4 library include directory")
FIND_PATH(PROJ_INCLUDE_DIR proj.h proj_experimental;h
PATHS ${PROJ_OSGEO4W_HOME}/include
DOC "Path to PROJ library include directory")
SET(PROJ4_NAMES ${PROJ4_NAMES} proj proj_i)
FIND_LIBRARY(PROJ4_LIBRARY
NAMES ${PROJ4_NAMES}
PATHS ${PROJ4_OSGEO4W_HOME}/lib
DOC "Path to PROJ.4 library file")
SET(PROJ_NAMES ${PROJ_NAMES} proj proj_i)
FIND_LIBRARY(PROJ_LIBRARY
NAMES ${PROJ_NAMES}
PATHS ${PROJ_OSGEO4W_HOME}/lib
DOC "Path to PROJ library file")
# Handle the QUIETLY and REQUIRED arguments and set SPATIALINDEX_FOUND to TRUE
# Handle the QUIETLY and REQUIRED arguments and set PROJ_FOUND to TRUE
# if all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PROJ4 DEFAULT_MSG PROJ4_LIBRARY PROJ4_INCLUDE_DIR)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PROJ DEFAULT_MSG PROJ_LIBRARY PROJ_INCLUDE_DIR)
IF(PROJ4_FOUND)
SET(PROJ4_LIBRARIES ${PROJ4_LIBRARY})
IF(PROJ_FOUND)
SET(PROJ_LIBRARIES ${PROJ_LIBRARY})
ENDIF()
EXTRA_DIST = FindGeoTIFF.cmake \
FindPROJ4.cmake \
FindPROJ.cmake \
geo_config.h.in \
project-config-version.cmake.in \
project-config.cmake.in \
......
......@@ -135,10 +135,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -177,7 +173,6 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
HAVE_LIBPROJ = @HAVE_LIBPROJ@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
......@@ -212,7 +207,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PROJ_INC = @PROJ_INC@
PROJ_INCLUDE = @PROJ_INCLUDE@
RANLIB = @RANLIB@
RELEASE_VERSION = @RELEASE_VERSION@
SED = @SED@
......@@ -230,7 +225,6 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
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@
......@@ -279,7 +273,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = FindGeoTIFF.cmake \
FindPROJ4.cmake \
FindPROJ.cmake \
geo_config.h.in \
project-config-version.cmake.in \
project-config.cmake.in \
......
This diff is collapsed.
m4_define([VERSION_MAJOR], [1])
m4_define([VERSION_MINOR], [4])
m4_define([VERSION_POINT], [3])
m4_define([VERSION_MINOR], [5])
m4_define([VERSION_POINT], [0])
m4_define([GEOTIFF_VERSION],
[VERSION_MAJOR.VERSION_MINOR.VERSION_POINT])
......@@ -25,8 +25,6 @@ dnl #########################################################################
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
AC_PROG_CC
AC_PROG_CXX