2009-12-02 23:03:24 +00:00
|
|
|
require 'formula'
|
|
|
|
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
def complete?
|
|
|
|
ARGV.include? "--complete"
|
|
|
|
end
|
|
|
|
|
|
|
|
def postgres?
|
|
|
|
ARGV.include? "--with-postgres"
|
|
|
|
end
|
|
|
|
|
|
|
|
def mysql?
|
|
|
|
ARGV.include? "--with-mysql"
|
|
|
|
end
|
|
|
|
|
|
|
|
def no_python?
|
|
|
|
ARGV.include? "--without-python"
|
|
|
|
end
|
|
|
|
|
2011-07-17 21:10:54 +00:00
|
|
|
def opencl?
|
|
|
|
ARGV.include? "--enable-opencl"
|
|
|
|
end
|
|
|
|
|
2011-03-10 05:11:03 +00:00
|
|
|
class Gdal < Formula
|
2011-07-17 21:10:54 +00:00
|
|
|
url 'http://download.osgeo.org/gdal/gdal-1.8.1.tar.gz'
|
2009-12-02 23:03:24 +00:00
|
|
|
homepage 'http://www.gdal.org/'
|
2011-07-17 21:10:54 +00:00
|
|
|
md5 'b32269893afc9dc9eced45e74e4c6bb4'
|
2009-12-02 23:03:24 +00:00
|
|
|
|
2011-07-25 16:40:40 +00:00
|
|
|
head 'https://svn.osgeo.org/gdal/trunk/gdal', :using => :svn
|
|
|
|
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
depends_on 'jpeg'
|
2009-12-02 23:03:24 +00:00
|
|
|
depends_on 'giflib'
|
|
|
|
depends_on 'proj'
|
|
|
|
depends_on 'geos'
|
|
|
|
|
2011-07-25 16:40:40 +00:00
|
|
|
depends_on "postgresql" if postgres?
|
|
|
|
depends_on "mysql" if mysql?
|
|
|
|
|
2011-09-11 16:17:49 +00:00
|
|
|
# Without Numpy, the Python bindings can't deal with raster data.
|
|
|
|
depends_on 'numpy' => :python unless no_python?
|
|
|
|
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
if complete?
|
|
|
|
# Raster libraries
|
|
|
|
depends_on "netcdf" # Also brings in HDF5
|
|
|
|
depends_on "jasper" # May need a keg-only GeoJasPer library as this one is
|
|
|
|
# not geo-spatially enabled.
|
2011-07-17 21:10:54 +00:00
|
|
|
depends_on "cfitsio"
|
|
|
|
depends_on "epsilon"
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
|
|
|
|
# Vector libraries
|
|
|
|
depends_on "unixodbc" # OS X version is not complete enough
|
|
|
|
depends_on "libspatialite"
|
|
|
|
depends_on "xerces-c"
|
2011-07-17 21:10:54 +00:00
|
|
|
depends_on "poppler"
|
|
|
|
|
|
|
|
# Other libraries
|
2011-08-31 02:26:26 +00:00
|
|
|
depends_on "xz" # get liblzma compression algorithm library from XZutils
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
end
|
|
|
|
|
2011-07-25 16:40:40 +00:00
|
|
|
def patches
|
|
|
|
if complete?
|
|
|
|
# EPSILON v0.9.x slightly modified the naming of some struct members. A
|
|
|
|
# fix is in the GDAL trunk but was kept out of 1.8.1 due to concern for
|
|
|
|
# users of EPSILON v0.8.x. Homebrew installs 0.9.2+ so this concern is a
|
|
|
|
# moot point.
|
|
|
|
{:p1 => DATA}
|
|
|
|
end
|
|
|
|
end
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
|
|
|
|
def options
|
|
|
|
[
|
|
|
|
['--complete', 'Use additional Homebrew libraries to provide more drivers.'],
|
|
|
|
['--with-postgres', 'Specify PostgreSQL as a dependency.'],
|
|
|
|
['--with-mysql', 'Specify MySQL as a dependency.'],
|
2011-07-17 21:10:54 +00:00
|
|
|
['--without-python', 'Build without Python support (disables a lot of tools).'],
|
|
|
|
['--enable-opencl', 'Build with support for OpenCL.']
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
]
|
|
|
|
end
|
|
|
|
|
|
|
|
def get_configure_args
|
|
|
|
args = [
|
|
|
|
# Base configuration.
|
|
|
|
"--disable-debug",
|
|
|
|
"--with-local=#{prefix}",
|
|
|
|
"--with-threads",
|
|
|
|
"--with-libtool",
|
|
|
|
|
|
|
|
# GDAL native backends.
|
|
|
|
"--with-libtiff=internal", # For bigTIFF support
|
|
|
|
"--with-geotiff=internal",
|
|
|
|
"--with-pcraster=internal",
|
|
|
|
"--with-pcidsk=internal",
|
|
|
|
"--with-bsb",
|
|
|
|
"--with-grib",
|
|
|
|
"--with-pam",
|
|
|
|
|
|
|
|
# Backends supported by OS X.
|
|
|
|
"--with-libz=/usr",
|
|
|
|
"--with-png=/usr/X11",
|
|
|
|
"--with-expat=/usr",
|
|
|
|
"--with-sqlite3=/usr",
|
|
|
|
|
|
|
|
# Default Homebrew backends.
|
|
|
|
"--with-jpeg=#{HOMEBREW_PREFIX}",
|
|
|
|
"--with-jpeg12",
|
|
|
|
"--with-gif=#{HOMEBREW_PREFIX}",
|
2011-07-17 21:10:54 +00:00
|
|
|
"--with-curl=/usr/bin/curl-config",
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
|
|
|
|
# GRASS backend explicitly disabled. Creates a chicken-and-egg problem.
|
|
|
|
# Should be installed seperately after GRASS installation using the
|
|
|
|
# official GDAL GRASS plugin.
|
|
|
|
"--without-grass",
|
2011-07-17 21:10:54 +00:00
|
|
|
"--without-libgrass",
|
|
|
|
|
|
|
|
# OPeNDAP support also explicitly disabled for now---causes the
|
|
|
|
# configuration of other components such as Curl and Spatialite to fail
|
|
|
|
# for unknown reasons.
|
|
|
|
"--with-dods-root=no"
|
|
|
|
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
]
|
|
|
|
|
|
|
|
# Optional library support for additional formats.
|
|
|
|
if complete?
|
|
|
|
args.concat [
|
2011-07-17 21:10:54 +00:00
|
|
|
"--with-liblzma=yes",
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
"--with-netcdf=#{HOMEBREW_PREFIX}",
|
|
|
|
"--with-hdf5=#{HOMEBREW_PREFIX}",
|
|
|
|
"--with-jasper=#{HOMEBREW_PREFIX}",
|
2011-07-17 21:10:54 +00:00
|
|
|
"--with-cfitsio=#{HOMEBREW_PREFIX}",
|
|
|
|
"--with-epsilon=#{HOMEBREW_PREFIX}",
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
"--with-odbc=#{HOMEBREW_PREFIX}",
|
|
|
|
"--with-spatialite=#{HOMEBREW_PREFIX}",
|
2011-07-17 21:10:54 +00:00
|
|
|
"--with-xerces=#{HOMEBREW_PREFIX}",
|
|
|
|
"--with-poppler=#{HOMEBREW_PREFIX}"
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
]
|
|
|
|
else
|
|
|
|
args.concat [
|
|
|
|
"--without-cfitsio",
|
|
|
|
"--without-netcdf",
|
|
|
|
"--without-ogdi",
|
|
|
|
"--without-hdf4",
|
|
|
|
"--without-hdf5",
|
2011-07-17 21:10:54 +00:00
|
|
|
"--without-openjpeg",
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
"--without-jasper",
|
|
|
|
"--without-xerces",
|
|
|
|
"--without-epsilon",
|
|
|
|
"--without-spatialite",
|
2011-07-17 21:10:54 +00:00
|
|
|
"--without-libkml",
|
|
|
|
"--without-poppler",
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
|
|
|
|
# The following libraries are either proprietary or available under
|
|
|
|
# non-free licenses. Interested users will have to install such
|
|
|
|
# software manually.
|
|
|
|
"--without-msg",
|
|
|
|
"--without-mrsid",
|
|
|
|
"--without-jp2mrsid",
|
|
|
|
"--without-kakadu",
|
|
|
|
"--without-fme",
|
|
|
|
"--without-ecw",
|
|
|
|
"--without-dwgdirect"
|
|
|
|
]
|
|
|
|
end
|
|
|
|
|
|
|
|
# Database support.
|
|
|
|
args << "--without-pg" unless postgres?
|
|
|
|
args << "--without-mysql" unless mysql?
|
|
|
|
args << "--without-sde" # ESRI ArcSDE databases
|
|
|
|
args << "--without-ingres" # Ingres databases
|
|
|
|
args << "--without-oci" # Oracle databases
|
|
|
|
args << "--without-idb" # IBM Informix DataBlades
|
|
|
|
|
|
|
|
# Hombrew-provided databases.
|
|
|
|
args << "--with-pg=#{HOMEBREW_PREFIX}/bin/pg_config" if postgres?
|
|
|
|
args << "--with-mysql=#{HOMEBREW_PREFIX}/bin/mysql_config" if mysql?
|
|
|
|
|
|
|
|
args << "--without-python" # Installed using a seperate set of
|
|
|
|
# steps so that everything winds up
|
|
|
|
# in the prefix.
|
|
|
|
|
|
|
|
# Scripting APIs that have not been re-worked to respect Homebrew prefixes.
|
|
|
|
#
|
|
|
|
# Currently disabled as they install willy-nilly into locations outside of
|
|
|
|
# the Hombrew prefix. Enable if you feel like it, but uninstallation may be
|
|
|
|
# a manual affair.
|
|
|
|
#
|
|
|
|
# TODO: Fix installation of script bindings so they install into the
|
|
|
|
# Homebrew prefix.
|
|
|
|
args << "--without-perl"
|
|
|
|
args << "--without-php"
|
|
|
|
args << "--without-ruby"
|
|
|
|
|
2011-07-17 21:10:54 +00:00
|
|
|
# OpenCL support
|
|
|
|
args << "--with-opencl" if opencl?
|
|
|
|
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
return args
|
|
|
|
end
|
|
|
|
|
2009-12-02 23:03:24 +00:00
|
|
|
def install
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
system "./configure", "--prefix=#{prefix}", *get_configure_args
|
2009-12-02 23:03:24 +00:00
|
|
|
system "make"
|
|
|
|
system "make install"
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
|
|
|
|
unless no_python?
|
|
|
|
# If setuptools happens to be installed, setup.py will cowardly refuse to
|
|
|
|
# install to anywhere that is not on the PYTHONPATH.
|
|
|
|
#
|
|
|
|
# Really setuptools, we're all consenting adults here...
|
|
|
|
python_lib = lib + "python"
|
|
|
|
ENV.append 'PYTHONPATH', python_lib
|
|
|
|
|
|
|
|
# setuptools is also apparently incapable of making the directory it's
|
|
|
|
# self
|
|
|
|
python_lib.mkpath
|
|
|
|
|
|
|
|
# `python-config` may try to talk us into building bindings for more
|
|
|
|
# architectures than we really should.
|
2011-03-18 17:30:47 +00:00
|
|
|
if MacOS.prefer_64_bit?
|
Refactored GDAL formula to increase functionality
The usefullness of the GDAL library is limited by the number of formats it
supports. In light of this, the formula has been re-worked to provide maximum
support for file formats without increasing the dependency list, with the
exception of common image formats such as JPEG and GIF. Changes made in persuit
of this goal are:
- Removed libtiff as a dependency-- now provided by an internal GDAL library for
support of the BigTIFF format.
- Added `jpeg` and `giflib` as dependencies to complete support for common image
file formats.
- Enabled GDAL-native BSB, GRIB and PCRaster support.
- Added support for Expat, CURL, and Sqlite3 which are provided by OS X.
- Added support for `--HEAD` builds that compile from the gdal-dev source
available via SVN.
Also, disabled drivers have been grouped according to open-source/proprietary
status.
Additionally, a `--complete` installation option has been added. This option is
will trigger the installation of additional Homebrew formulae that increase the
capabilities of GDAL. By specifying the `--complete` flag, GDAL will now depend
on and link against the following libraries in order to provide more drivers for
reading and writing data:
Raster Formats:
- HDF5
- NetCDF
- JasPer
Vector Formats:
- ODBC
- LibSpatialite
- Xerces-C
Support for database servers has been added via the `--with-postgres` and
`--with-mysql` flags. These will cause PostgreSQL or MySQL to be added the
dependency list of GDAL.
Python bindings are now built by default as they provide ~18 additional command
line tools in addition to the Python module. The formula ensures that these
bindings are installed into the Homebrew prefix and not some random Python site
directory. Compilation of the bindings can be disabled by passing the
`--without-python` flag to `brew install`.
The Perl, PHP and Ruby bindings remain disabled as they install outside of the
Homebrew prefix. Users may manually enable them at their discretion. Getting
these bindings to install into the brew prefix is an area for further
development.
Finally, some cleanup of the configure options has occurred:
- Removed invalid configuration options.
- Fixed threading support.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
2010-09-25 17:58:18 +00:00
|
|
|
ENV.append_to_cflags '-arch x86_64'
|
|
|
|
else
|
|
|
|
ENV.append_to_cflags '-arch i386'
|
|
|
|
end
|
|
|
|
|
|
|
|
Dir.chdir 'swig/python' do
|
|
|
|
system "python", "setup.py", "install_lib", "--install-dir=#{python_lib}"
|
|
|
|
bin.install Dir['scripts/*']
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
unless no_python?
|
|
|
|
def caveats
|
|
|
|
<<-EOS
|
|
|
|
This version of GDAL was built with Python support. In addition to providing
|
|
|
|
modules that makes GDAL functions available to Python scripts, the Python
|
|
|
|
binding provides ~18 additional command line tools. However, both the Python
|
|
|
|
bindings and the additional tools will be unusable unless the following
|
|
|
|
directory is added to the PYTHONPATH:
|
|
|
|
#{HOMEBREW_PREFIX}/lib/python
|
|
|
|
EOS
|
|
|
|
end
|
2009-12-02 23:03:24 +00:00
|
|
|
end
|
|
|
|
end
|
2011-07-17 21:10:54 +00:00
|
|
|
|
2011-07-25 16:40:40 +00:00
|
|
|
|
2011-07-17 21:10:54 +00:00
|
|
|
__END__
|
|
|
|
|
|
|
|
This patch updates GDAL to be compatible with EPSILON 0.9.x. Changes sourced from the GDAL trunk:
|
|
|
|
|
|
|
|
http://trac.osgeo.org/gdal/changeset/22363
|
|
|
|
|
|
|
|
Patch can be removed when GDAL hits 1.9.0.
|
|
|
|
|
|
|
|
diff --git a/frmts/epsilon/epsilondataset.cpp b/frmts/epsilon/epsilondataset.cpp
|
|
|
|
index b12928a..3f967cc 100644
|
|
|
|
--- a/frmts/epsilon/epsilondataset.cpp
|
|
|
|
+++ b/frmts/epsilon/epsilondataset.cpp
|
|
|
|
@@ -48,6 +48,13 @@ typedef struct
|
|
|
|
vsi_l_offset offset;
|
|
|
|
} BlockDesc;
|
|
|
|
|
|
|
|
+#ifdef I_WANT_COMPATIBILITY_WITH_EPSILON_0_8_1
|
|
|
|
+#define GET_FIELD(hdr, field) \
|
|
|
|
+ (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.field : hdr.tc.field
|
|
|
|
+#else
|
|
|
|
+#define GET_FIELD(hdr, field) \
|
|
|
|
+ (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.field : hdr.hdr_data.tc.field
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
/************************************************************************/
|
|
|
|
/* ==================================================================== */
|
|
|
|
@@ -237,8 +244,8 @@ CPLErr EpsilonRasterBand::IReadBlock( int nBlockXOff,
|
|
|
|
return CE_Failure;
|
|
|
|
}
|
|
|
|
|
|
|
|
- int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.w : hdr.tc.w;
|
|
|
|
- int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.h : hdr.tc.h;
|
|
|
|
+ int w = GET_FIELD(hdr, w);
|
|
|
|
+ int h = GET_FIELD(hdr, h);
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (poGDS->nBands == 1)
|
|
|
|
@@ -505,12 +512,12 @@ int EpsilonDataset::ScanBlocks(int* pnBands)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
- int W = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.W : hdr.tc.W;
|
|
|
|
- int H = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.H : hdr.tc.H;
|
|
|
|
- int x = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.x : hdr.tc.x;
|
|
|
|
- int y = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.y : hdr.tc.y;
|
|
|
|
- int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.w : hdr.tc.w;
|
|
|
|
- int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.h : hdr.tc.h;
|
|
|
|
+ int W = GET_FIELD(hdr, W);
|
|
|
|
+ int H = GET_FIELD(hdr, H);
|
|
|
|
+ int x = GET_FIELD(hdr, x);
|
|
|
|
+ int y = GET_FIELD(hdr, y);
|
|
|
|
+ int w = GET_FIELD(hdr, w);
|
|
|
|
+ int h = GET_FIELD(hdr, h);
|
|
|
|
|
|
|
|
//CPLDebug("EPSILON", "W=%d,H=%d,x=%d,y=%d,w=%d,h=%d,offset=" CPL_FRMT_GUIB,
|
|
|
|
// W, H, x, y, w, h, nStartBlockFileOff);
|