[fdo-commits] r77 - in branches/3.2.x/Providers/GDAL: Docs
Docs/doc_src Docs/doc_src/group_and_page_definitions
Docs/doc_src/headers_and_footers Src/Provider Src/UnitTest
svn_fdo at osgeo.org
svn_fdo at osgeo.org
Wed Jan 24 20:19:20 EST 2007
Author: gregboone
Date: 2007-01-24 20:19:19 -0500 (Wed, 24 Jan 2007)
New Revision: 77
Added:
branches/3.2.x/Providers/GDAL/Docs/doc_src/
branches/3.2.x/Providers/GDAL/Docs/doc_src/Doxyfile_GDAL
branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile
branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile.am
branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile.in
branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/
branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile
branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.am
branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.in
branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/define_pages.h
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.am
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.in
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/custom.css
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/footer.html
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/header.html
branches/3.2.x/Providers/GDAL/Docs/doc_src/warning_logfile.txt
Removed:
branches/3.2.x/Providers/GDAL/Docs/doc_src/Doxyfile_GDAL
branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile
branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile.am
branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile.in
branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/
branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile
branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.am
branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.in
branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/define_pages.h
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.am
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.in
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/custom.css
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/footer.html
branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/header.html
branches/3.2.x/Providers/GDAL/Docs/doc_src/warning_logfile.txt
Modified:
branches/3.2.x/Providers/GDAL/Docs/Makefile.am
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpBandRaster.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpClassData.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpClassData.h
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpConnection.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpConnection.h
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpDatasetCache.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRaster.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRaster.h
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRasterImp.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRasterImp.h
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoRasterExtractor.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoRasterExtractor.h
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImage.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImage.h
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImageFactory.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImageFactory.h
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRaster.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterCapabilities.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterPropertyDictionary.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterUtil.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpSchemaData.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpSchemaData.h
branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpStreamReaderByTile.cpp
branches/3.2.x/Providers/GDAL/Src/Provider/RFP.vcproj
branches/3.2.x/Providers/GDAL/Src/UnitTest/RfpTestThorough.cpp
Log:
Update GDAL source in 3.2.x from GDAL source code in the trunk
Modified: branches/3.2.x/Providers/GDAL/Docs/Makefile.am
===================================================================
--- branches/3.2.x/Providers/GDAL/Docs/Makefile.am 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/Makefile.am 2007-01-25 01:19:19 UTC (rev 77)
@@ -17,9 +17,9 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS =
+SUBDIRS = doc_src
-DIST_SUBDIRS =
+DIST_SUBDIRS = doc_src
EXTRA_DIST = XmlSchema/FdoGrfpConfig.xsd XmlSchema/FdoGrfpOverride.xsd XmlSchema/GrfpConfigExample.xml
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src (from rev 76, trunk/Providers/GDAL/Docs/doc_src)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/Doxyfile_GDAL
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/Doxyfile_GDAL 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/Doxyfile_GDAL 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,224 +0,0 @@
-# Doxyfile 1.4.6
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME = "FDO Provider for GDAL"
-PROJECT_NUMBER =
-OUTPUT_DIRECTORY =
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-USE_WINDOWS_ENCODING = NO
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF =
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = YES
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = YES
-TAB_SIZE = 4
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-BUILTIN_STL_SUPPORT = NO
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = NO
-HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = NO
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = YES
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = NO
-GENERATE_TESTLIST = NO
-GENERATE_BUGLIST = NO
-GENERATE_DEPRECATEDLIST= NO
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = NO
-WARN_IF_UNDOCUMENTED = NO
-WARN_IF_DOC_ERROR = NO
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE = warning_logfile.txt
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = group_and_page_definitions \
- ../../Inc/GdalFile
-FILE_PATTERNS = *.h
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXAMPLE_PATH = headers_and_footers
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = YES
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = NO
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = ../HTML/GDAL
-HTML_FILE_EXTENSION = .html
-HTML_HEADER = headers_and_footers/header.html
-HTML_FOOTER = headers_and_footers/footer.html
-HTML_STYLESHEET = headers_and_footers/custom.css
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = YES
-CHM_FILE = ../../GDAL_Provider_API.chm
-HHC_LOCATION = "C:/Program Files/HTML Help Workshop/hhc.exe"
-GENERATE_CHI = NO
-BINARY_TOC = YES
-TOC_EXPAND = YES
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = YES
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = YES
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = NO
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = YES
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = NO
-GROUP_GRAPHS = NO
-UML_LOOK = YES
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = YES
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
-MAX_DOT_GRAPH_DEPTH = 1000
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/Doxyfile_GDAL (from rev 76, trunk/Providers/GDAL/Docs/doc_src/Doxyfile_GDAL)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/Makefile 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,473 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# Docs/doc_src/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 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.
-
-
-srcdir = .
-top_srcdir = ../..
-
-pkgdatadir = $(datadir)/fdosdf
-pkglibdir = $(libdir)/fdosdf
-pkgincludedir = $(includedir)/fdosdf
-top_builddir = ../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-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 = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-subdir = Docs/doc_src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE =
-AMTAR = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run automake-1.9
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS =
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -MMD -MT
-CXXFLAGS_SDF =
-CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"FDOSDF\" -DPACKAGE_TARNAME=\"fdosdf\" -DPACKAGE_VERSION=\"3.2.0\" -DPACKAGE_STRING=\"FDOSDF\ 3.2.0\" -DPACKAGE_BUGREPORT=\"http://www.fdo.osgeo.org\" -DPACKAGE=\"fdosdf\" -DVERSION=\"3.2.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1
-DEPDIR = .deps
-ECHO = echo
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = grep -E
-EXEEXT =
-F77 = g77
-FDO = /home/warmerda/pkg/fdocore/Fdo
-FDOTHIRDPARTY = /home/warmerda/pkg/fdocore/Thirdparty
-FDOUTILITIES = /home/warmerda/pkg/fdocore/Utilities
-FFLAGS = -g -O2
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS =
-LIBOBJS =
-LIBS =
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run makeinfo
-OBJEXT = o
-PACKAGE = fdosdf
-PACKAGE_BUGREPORT = http://www.fdo.osgeo.org
-PACKAGE_NAME = FDOSDF
-PACKAGE_STRING = FDOSDF 3.2.0
-PACKAGE_TARNAME = fdosdf
-PACKAGE_VERSION = 3.2.0
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE =
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 3.2.0
-YACC = bison -y
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE =
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE =
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias =
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias =
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/warmerda/fdo/Providers/SDF/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local/fdo-3.2.0
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias =
-AUTOMAKE_OPTIONS = foreign
-SUBDIRS = group_and_page_definitions headers_and_footers
-DIST_SUBDIRS = group_and_page_definitions headers_and_footers
-EXTRA_DIST = Doxyfile_SDF
-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) --foreign Docs/doc_src/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Docs/doc_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
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
-# 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"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @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)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- 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" \
- 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-libtool \
- distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-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: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-libtool \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-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:
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile (from rev 76, trunk/Providers/GDAL/Docs/doc_src/Makefile)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile.am
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/Makefile.am 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile.am 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,24 +0,0 @@
-##
-## Copyright (C) 2004-2006 Autodesk, Inc.
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of version 2.1 of the GNU Lesser
-## General Public License as published by the Free Software Foundation.
-##
-## This library 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
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = group_and_page_definitions headers_and_footers
-
-DIST_SUBDIRS = group_and_page_definitions headers_and_footers
-
-EXTRA_DIST = Doxyfile_GDAL
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile.am (from rev 76, trunk/Providers/GDAL/Docs/doc_src/Makefile.am)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile.in
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/Makefile.in 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile.in 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,473 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 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.
-
- at SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-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 = Docs/doc_src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-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@
-CXXFLAGS_SDF = @CXXFLAGS_SDF@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FDO = @FDO@
-FDOTHIRDPARTY = @FDOTHIRDPARTY@
-FDOUTILITIES = @FDOUTILITIES@
-FFLAGS = @FFLAGS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-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@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-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@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AUTOMAKE_OPTIONS = foreign
-SUBDIRS = group_and_page_definitions headers_and_footers
-DIST_SUBDIRS = group_and_page_definitions headers_and_footers
-EXTRA_DIST = Doxyfile_SDF
-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) --foreign Docs/doc_src/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Docs/doc_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
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-
-# 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"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @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)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- 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" \
- 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-libtool \
- distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-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: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive distclean distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-libtool \
- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-info-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:
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/Makefile.in (from rev 76, trunk/Providers/GDAL/Docs/doc_src/Makefile.in)
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions (from rev 76, trunk/Providers/GDAL/Docs/doc_src/group_and_page_definitions)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,315 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# Docs/doc_src/group_and_page_definitions/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 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.
-
-
-srcdir = .
-top_srcdir = ../../..
-
-pkgdatadir = $(datadir)/fdosdf
-pkglibdir = $(libdir)/fdosdf
-pkgincludedir = $(includedir)/fdosdf
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-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 = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-subdir = Docs/doc_src/group_and_page_definitions
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE =
-AMTAR = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run automake-1.9
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS =
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -MMD -MT
-CXXFLAGS_SDF =
-CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"FDOSDF\" -DPACKAGE_TARNAME=\"fdosdf\" -DPACKAGE_VERSION=\"3.2.0\" -DPACKAGE_STRING=\"FDOSDF\ 3.2.0\" -DPACKAGE_BUGREPORT=\"http://www.fdo.osgeo.org\" -DPACKAGE=\"fdosdf\" -DVERSION=\"3.2.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1
-DEPDIR = .deps
-ECHO = echo
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = grep -E
-EXEEXT =
-F77 = g77
-FDO = /home/warmerda/pkg/fdocore/Fdo
-FDOTHIRDPARTY = /home/warmerda/pkg/fdocore/Thirdparty
-FDOUTILITIES = /home/warmerda/pkg/fdocore/Utilities
-FFLAGS = -g -O2
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS =
-LIBOBJS =
-LIBS =
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run makeinfo
-OBJEXT = o
-PACKAGE = fdosdf
-PACKAGE_BUGREPORT = http://www.fdo.osgeo.org
-PACKAGE_NAME = FDOSDF
-PACKAGE_STRING = FDOSDF 3.2.0
-PACKAGE_TARNAME = fdosdf
-PACKAGE_VERSION = 3.2.0
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE =
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 3.2.0
-YACC = bison -y
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE =
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE =
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias =
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias =
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/warmerda/fdo/Providers/SDF/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local/fdo-3.2.0
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias =
-AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = define_pages.h
-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) --foreign Docs/doc_src/group_and_page_definitions/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Docs/doc_src/group_and_page_definitions/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
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- 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
-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-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-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-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-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:
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile (from rev 76, trunk/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.am
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.am 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.am 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,20 +0,0 @@
-##
-## Copyright (C) 2004-2006 Autodesk, Inc.
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of version 2.1 of the GNU Lesser
-## General Public License as published by the Free Software Foundation.
-##
-## This library 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
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = define_pages.h
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.am (from rev 76, trunk/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.am)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.in
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.in 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.in 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,315 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 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.
-
- at SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-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 = Docs/doc_src/group_and_page_definitions
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-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@
-CXXFLAGS_SDF = @CXXFLAGS_SDF@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FDO = @FDO@
-FDOTHIRDPARTY = @FDOTHIRDPARTY@
-FDOUTILITIES = @FDOUTILITIES@
-FFLAGS = @FFLAGS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-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@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-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@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = define_pages.h
-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) --foreign Docs/doc_src/group_and_page_definitions/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Docs/doc_src/group_and_page_definitions/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
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- 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
-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-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-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-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-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:
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.in (from rev 76, trunk/Providers/GDAL/Docs/doc_src/group_and_page_definitions/Makefile.in)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/define_pages.h
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/group_and_page_definitions/define_pages.h 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/define_pages.h 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,24 +0,0 @@
-/*! \mainpage Introduction
-<div class="mainpage">
-<!-- This is the index.html page that the user first sees. -->
-
-<p>The Feature Data Objects (FDO) API provides access to data in a
-data store. A provider is a specific implementation of the FDO API
-that provides access to data in a particular data store. The FDO
-Provider for GDAL provides FDO with access to an GDAL-based data store.
-
-<p>The FDO Provider for GDAL uses the GDAL library for reading a variety
-of raster formats.
-</p>
-For more information, see <i>The Essential FDO</i> (FET_TheEssentialFDO.pdf),
-the <i>FDO Developer's Guide</i> (FDG_FDODevGuide.pdf) and the GDAL web
-site (<a href="http://www.gdal.org/">www.gdal.org</a>).
-</p>
-
-<br>
-</div>
-*/
-
-
-
-
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/group_and_page_definitions/define_pages.h (from rev 76, trunk/Providers/GDAL/Docs/doc_src/group_and_page_definitions/define_pages.h)
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers (from rev 76, trunk/Providers/GDAL/Docs/doc_src/headers_and_footers)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,315 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# Docs/doc_src/headers_and_footers/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 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.
-
-
-srcdir = .
-top_srcdir = ../../..
-
-pkgdatadir = $(datadir)/fdosdf
-pkglibdir = $(libdir)/fdosdf
-pkgincludedir = $(includedir)/fdosdf
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-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 = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-subdir = Docs/doc_src/headers_and_footers
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE =
-AMTAR = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run automake-1.9
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS =
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -MMD -MT
-CXXFLAGS_SDF =
-CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"FDOSDF\" -DPACKAGE_TARNAME=\"fdosdf\" -DPACKAGE_VERSION=\"3.2.0\" -DPACKAGE_STRING=\"FDOSDF\ 3.2.0\" -DPACKAGE_BUGREPORT=\"http://www.fdo.osgeo.org\" -DPACKAGE=\"fdosdf\" -DVERSION=\"3.2.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1
-DEPDIR = .deps
-ECHO = echo
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = grep -E
-EXEEXT =
-F77 = g77
-FDO = /home/warmerda/pkg/fdocore/Fdo
-FDOTHIRDPARTY = /home/warmerda/pkg/fdocore/Thirdparty
-FDOUTILITIES = /home/warmerda/pkg/fdocore/Utilities
-FFLAGS = -g -O2
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS =
-LIBOBJS =
-LIBS =
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/warmerda/fdo/Providers/SDF/missing --run makeinfo
-OBJEXT = o
-PACKAGE = fdosdf
-PACKAGE_BUGREPORT = http://www.fdo.osgeo.org
-PACKAGE_NAME = FDOSDF
-PACKAGE_STRING = FDOSDF 3.2.0
-PACKAGE_TARNAME = fdosdf
-PACKAGE_VERSION = 3.2.0
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE =
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 3.2.0
-YACC = bison -y
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE =
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE =
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias =
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias =
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/warmerda/fdo/Providers/SDF/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local/fdo-3.2.0
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias =
-AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = custom.css footer.html header.html
-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) --foreign Docs/doc_src/headers_and_footers/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Docs/doc_src/headers_and_footers/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
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- 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
-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-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-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-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-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:
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile (from rev 76, trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.am
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.am 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.am 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,20 +0,0 @@
-##
-## Copyright (C) 2004-2006 Autodesk, Inc.
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of version 2.1 of the GNU Lesser
-## General Public License as published by the Free Software Foundation.
-##
-## This library 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
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = custom.css footer.html header.html
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.am (from rev 76, trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.am)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.in
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.in 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.in 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,315 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 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.
-
- at SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-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 = Docs/doc_src/headers_and_footers
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-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@
-CXXFLAGS_SDF = @CXXFLAGS_SDF@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FDO = @FDO@
-FDOTHIRDPARTY = @FDOTHIRDPARTY@
-FDOUTILITIES = @FDOUTILITIES@
-FFLAGS = @FFLAGS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-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@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-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@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = custom.css footer.html header.html
-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) --foreign Docs/doc_src/headers_and_footers/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Docs/doc_src/headers_and_footers/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
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- 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
-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-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-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-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-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:
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.in (from rev 76, trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/Makefile.in)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/custom.css
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/custom.css 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/custom.css 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,96 +0,0 @@
- at import url(doxygen.css);
-
-
-div.Syntax{
- background-color:#FFFFD9;
-}
-
-div.Example{
- background-color:#E9E9E9;
-}
-
-/* table cells on the main page (index.html) */
-div.mainpage td {
- background-color: #FFFFCC;
- border-right-color: #FF6633;
- border-bottom-color: #FF6633;
- border-left-color: #FFCC33;
- border-top-color: #FFCC33;
- text-align: center;
-}
-
-/*** Used in external topics ***/
-p.indent_1 {
- padding-left: 0.25in;
-}
-p.indent_2 {
- padding-left: 0.5in;
-}
-p.indent_3 {
- padding-left: 0.75in;
-}
-table.RuledTable {
- border-collapse: collapse;
- table-layout: auto;
- width: auto;
- cellpadding: none;
- cellspacing: none;
-}
-table.RuledTable th {
- background-color: #CCCCCC;
-
- border-left-style: solid;
- border-left-width: thin;
- border-left-color: #000000;
-
- border-right-style: solid;
- border-right-width: thin;
- border-right-color: #000000;
-
- border-bottom-style: solid;
- border-bottom-width: thin;
- border-bottom-color: #000000;
-
- border-top-style: solid;
- border-top-width: thin;
- border-top-color: #000000;
-
- padding: 6px;
-
- width: auto;
-}
-table.RuledTable td {
- border-bottom-style: solid;
- border-bottom-width: thin;
- border-bottom-color: #000000;
-
- border-left-style: solid;
- border-left-width: thin;
- border-left-color: #000000;
-
- border-right-style: solid;
- border-right-width: thin;
- border-right-color: #000000;
-
- padding-left: 6px;
- padding-right: 6px;
- padding-top: 4px;
- padding-top: 4px;
-
- width: auto;
-}
-td.shaded{
- background-color:#CCCCCC;
-}
-/* Used in Geometry_FgfText.h */
-p.row_1 {
- font-family: "Courier New", Courier, monospace;
- background-color: #FFFFCC;
-}
-pre.row_2 {
- font-family: "Courier New", Courier, monospace;
- background-color: #E7FFCE;
-}
-
-
-
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/custom.css (from rev 76, trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/custom.css)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/footer.html
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/footer.html 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/footer.html 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,10 +0,0 @@
-<!-- footer.html -->
- <hr>
- <table width="100%" border="0">
- <tr>
- <td align="right"><font size="-2"><a href="mailto:isd.docs at autodesk.com&subject=FDO%20Provider%20for%20GDAL%20API%20documentation">Comments?</a></font></td>
- <!-- The logo can go in another cell, when we get one -->
- </tr>
- </table>
- </body>
-</html>
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/footer.html (from rev 76, trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/footer.html)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/header.html
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/header.html 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/header.html 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <title>OSGeo FDO Provider for GDAL API Reference</title>
- <link href="$relpath$custom.css" rel="stylesheet" type="text/css">
- <link href="$relpath$tabs.css" rel="stylesheet" type="text/css">
- </head>
- <body bgcolor="#FFFFFF">
- <table width="100%" border="0">
- <tr>
- <td><b>API Reference<b></td>
- <td align="right"><b>OSGeo FDO Provider for GDAL<b></td>
- </tr>
-
- </table>
-<!-- End of: header.html -->
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/headers_and_footers/header.html (from rev 76, trunk/Providers/GDAL/Docs/doc_src/headers_and_footers/header.html)
Deleted: branches/3.2.x/Providers/GDAL/Docs/doc_src/warning_logfile.txt
===================================================================
--- trunk/Providers/GDAL/Docs/doc_src/warning_logfile.txt 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Docs/doc_src/warning_logfile.txt 2007-01-25 01:19:19 UTC (rev 77)
@@ -1,24 +0,0 @@
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Problems running dot. Check your installation!
-Error: user specified HTML style sheet file does not exist!
-Error: failed to run html help compiler on index.hhp
\ No newline at end of file
Copied: branches/3.2.x/Providers/GDAL/Docs/doc_src/warning_logfile.txt (from rev 76, trunk/Providers/GDAL/Docs/doc_src/warning_logfile.txt)
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpBandRaster.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpBandRaster.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpBandRaster.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -27,7 +27,6 @@
#include "FDORFP.h"
#include "FdoRfpBandRaster.h"
-#include "FdoRfpImageFactory.h"
#include "FdoRfpRasterCapabilities.h"
#include "FdoRfpGeoRaster.h"
#include "FdoRfpStreamReaderByTile.h"
@@ -46,11 +45,10 @@
m_resolutionX(NULL), m_resolutionY(NULL), m_bounds(NULL)
{
_computeOriginalBounds();
+ _recomputeImageSize();
if (clippingBounds != NULL)
- m_clippingBounds = new FdoRfpRect(*clippingBounds);
-
- _recomputeImageSize();
+ SetBounds( clippingBounds );
}
FdoRfpBandRaster::~FdoRfpBandRaster()
@@ -202,7 +200,8 @@
dataModel->SetDataModelType(FdoRasterDataModelType_RGBA);
else if( image->m_components == 3 )
dataModel->SetDataModelType(FdoRasterDataModelType_RGB);
- else if( GDALGetRasterColorInterpretation( image->m_redBand ) == GCI_PaletteIndex )
+ else if( GDALGetRasterColorInterpretation( GDALGetRasterBand(image->GetDS(), image->m_bandList[0]) )
+ == GCI_PaletteIndex )
dataModel->SetDataModelType(FdoRasterDataModelType_Palette);
else
dataModel->SetDataModelType(FdoRasterDataModelType_Gray);
@@ -240,6 +239,8 @@
m_dataModel = dataModel;
+ image->ReleaseDS();
+
return FDO_SAFE_ADDREF(m_dataModel.p);
}
@@ -411,7 +412,7 @@
int bGotNoData;
double dfNoData;
- dfNoData = GDALGetRasterNoDataValue( image->m_redBand, &bGotNoData );
+ dfNoData = GDALGetRasterNoDataValue( GDALGetRasterBand( image->GetDS(), image->m_bandList[0]), &bGotNoData );
if( image->m_components == 1 && bGotNoData )
{
@@ -503,10 +504,8 @@
FdoRfpRect viewBounds = _getRequestBounds();
double origResolutionX, origResolutionY;
- origResolutionX = (origBounds.m_maxX - origBounds.m_minX) /
- GDALGetRasterXSize( image->m_ds );
- origResolutionY = -1 * (origBounds.m_maxY - origBounds.m_minY) /
- GDALGetRasterYSize( image->m_ds );
+ origResolutionX = (origBounds.m_maxX - origBounds.m_minX) / image->m_xSize;
+ origResolutionY = -1 * (origBounds.m_maxY - origBounds.m_minY) / image->m_ySize;
winXOff = (int) floor((viewBounds.m_minX - origBounds.m_minX) / origResolutionX);
winYOff = (int) floor((viewBounds.m_maxY - origBounds.m_maxY) / origResolutionY);
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpClassData.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpClassData.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpClassData.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -45,8 +45,12 @@
{
}
-void FdoRfpClassData::_buildUp(const FdoPtr<FdoRfpSpatialContextCollection>& contexts, const FdoClassDefinitionP& classDefinition, const FdoPtr<FdoGrfpClassDefinition>& classMapping)
+void FdoRfpClassData::_buildUp(FdoRfpConnection *conn,
+ const FdoClassDefinitionP& classDefinition,
+ const FdoPtr<FdoGrfpClassDefinition>& classMapping)
{
+ FdoPtr<FdoRfpSpatialContextCollection> contexts = conn->GetSpatialContexts();
+
m_classDefinition = classDefinition;
m_geoRasters = FdoRfpGeoRasterCollection::Create();
if (classMapping == NULL)
@@ -99,9 +103,9 @@
FdoGrfpRasterFeaturesP featureCatalogue = location->GetFeatureCatalogue();
if (featureCatalogue->GetCount() == 0)
- _buildUpGeoRastersFromLocation(location->GetName(), coordSystems);
+ _buildUpGeoRastersFromLocation(conn, location->GetName(), coordSystems);
else
- _buildUpGeoRastersFromCatalogue(featureCatalogue, coordSystems);
+ _buildUpGeoRastersFromCatalogue(conn, featureCatalogue, coordSystems);
}
// First decide whether the coordinate system is already set for the class
@@ -199,17 +203,21 @@
}
// Extract all rasters from specified location, return value is the associated coordinate system name
-void FdoRfpClassData::_buildUpGeoRastersFromLocation(FdoString* location, FdoStringCollection* coordSystems)
+void FdoRfpClassData::_buildUpGeoRastersFromLocation(FdoRfpConnection *conn,
+ FdoString* location,
+ FdoStringCollection* coordSystems)
{
FdoRfpGeoRasterExtractor extractor;
- extractor.ExtractRasters(location, m_geoRasters, m_coord, m_extent, m_bFirstRaster, coordSystems);
+ extractor.ExtractRasters(conn, location, m_geoRasters, m_coord, m_extent, m_bFirstRaster, coordSystems);
}
// Extract all rasters from image catalogue, return value is the associated coordinate system name
-void FdoRfpClassData::_buildUpGeoRastersFromCatalogue(const FdoPtr<FdoGrfpRasterFeatureCollection>& featureCatalogue, FdoStringCollection* coordSystems)
+void FdoRfpClassData::_buildUpGeoRastersFromCatalogue(FdoRfpConnection *conn,
+ const FdoPtr<FdoGrfpRasterFeatureCollection>& featureCatalogue,
+ FdoStringCollection* coordSystems)
{
VALIDATE_ARGUMENT(coordSystems);
- FdoPtr<FdoRfpDatasetCache> datasetCache = FdoRfpDatasetCache::Create();
+ FdoPtr<FdoRfpDatasetCache> datasetCache = conn->GetDatasetCache();
FdoInt32 i, j, bandCount;
@@ -255,6 +263,7 @@
bool bHasGeoInfo = FdoRfpRasterUtil::GetGeoReferenceInfo(hDS, geoRef);
datasetCache->UnlockDataset( hDS );
+ hDS = NULL;
// coordinate system handling
//
@@ -301,7 +310,8 @@
}
}
- FdoRfpGeoBandRasterP geoBandRaster = new FdoRfpGeoBandRasterRot(path, imageDef->GetFrameNumber()-1,
+ FdoRfpGeoBandRasterP geoBandRaster = new FdoRfpGeoBandRasterRot(m_connection, path,
+ imageDef->GetFrameNumber()-1,
insX, insY,
resX, resY,
width,height,
@@ -325,10 +335,14 @@
}
-FdoRfpClassData* FdoRfpClassData::Create(const FdoPtr<FdoRfpSpatialContextCollection>& contexts, const FdoClassDefinitionP& classDefinition, const FdoPtr<FdoGrfpClassDefinition>& classMapping)
+FdoRfpClassData* FdoRfpClassData::Create(FdoRfpConnection *conn, const FdoClassDefinitionP& classDefinition, const FdoPtr<FdoGrfpClassDefinition>& classMapping)
{
FdoRfpClassData* classData = new FdoRfpClassData();
- classData->_buildUp(contexts, classDefinition, classMapping);
+
+ classData->m_connection = conn;
+ FDO_SAFE_ADDREF( classData->m_connection.p );
+
+ classData->_buildUp(conn, classDefinition, classMapping);
return classData;
}
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpClassData.h
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpClassData.h 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpClassData.h 2007-01-25 01:19:19 UTC (rev 77)
@@ -42,9 +42,10 @@
// Data members
//
private:
- FdoPtr<FdoRfpGeoRasterCollection> m_geoRasters;
- FdoClassDefinitionP m_classDefinition;
-
+ FdoPtr<FdoRfpGeoRasterCollection> m_geoRasters;
+ FdoClassDefinitionP m_classDefinition;
+ FdoPtr<FdoRfpConnection> m_connection;
+
// these two are used to form spatial context for this feature class
FdoRfpRect m_extent; // extent
FdoStringP m_coord; // coordinate system name
@@ -57,7 +58,7 @@
FdoRfpClassData(void);
virtual ~FdoRfpClassData(void);
public:
- static FdoRfpClassData* Create(const FdoPtr<FdoRfpSpatialContextCollection>& contexts, const FdoClassDefinitionP& classDefinition, const FdoPtr<FdoGrfpClassDefinition>& classMapping);
+ static FdoRfpClassData* Create(FdoRfpConnection *conn, const FdoClassDefinitionP& classDefinition, const FdoPtr<FdoGrfpClassDefinition>& classMapping);
//
// Exposed functions
@@ -73,13 +74,13 @@
//
private:
// called by the static create
- void _buildUp(const FdoPtr<FdoRfpSpatialContextCollection>& contexts, const FdoClassDefinitionP& classDefinition, const FdoPtr<FdoGrfpClassDefinition>& classMapping);
+ void _buildUp(FdoRfpConnection *conn, const FdoClassDefinitionP& classDefinition, const FdoPtr<FdoGrfpClassDefinition>& classMapping);
// Extract all rasters from specified location
- void _buildUpGeoRastersFromLocation(FdoString* location, FdoStringCollection* coordSystems);
+ void _buildUpGeoRastersFromLocation(FdoRfpConnection *conn, FdoString* location, FdoStringCollection* coordSystems);
// Extract all rasters from image catalogue
- void _buildUpGeoRastersFromCatalogue(const FdoPtr<FdoGrfpRasterFeatureCollection>& featureCatalogue, FdoStringCollection* coordSystems);
+ void _buildUpGeoRastersFromCatalogue(FdoRfpConnection *conn, const FdoPtr<FdoGrfpRasterFeatureCollection>& featureCatalogue, FdoStringCollection* coordSystems);
};
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpConnection.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpConnection.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpConnection.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -42,6 +42,7 @@
#include "FdoRfpDescribeSchemaCommand.h"
#include "FdoRfpDescribeSchemaMapping.h"
#include "FdoRfpGetSpatialContexts.h"
+#include "FdoRfpDatasetCache.h"
#include "FdoRfpGlobals.h"
#include <GdalFile/Override/FdoGrfpOverrides.h>
#include <gdal.h>
@@ -274,7 +275,7 @@
FdoGrfpPhysicalSchemaMappingP mapping1;
if (mapping != NULL)
mapping1 = SP_STATIC_CAST(FdoGrfpPhysicalSchemaMapping, mapping);
- FdoRfpSchemaDataP schemaData = FdoRfpSchemaData::Create(m_spatialContexts, fs, mapping1);
+ FdoRfpSchemaDataP schemaData = FdoRfpSchemaData::Create(this, fs, mapping1);
m_schemaDatas->Add(schemaData);
}
}
@@ -549,7 +550,11 @@
FdoPtr<FdoRfpSpatialContextCollection> FdoRfpConnection::GetSpatialContexts()
{
//Ensure the connection is established
- _validateOpen();
+
+ // in fact, we want to fetch this down in low level code before things
+ // are open sometimes.
+
+ //_validateOpen();
return m_spatialContexts;
}
@@ -603,6 +608,16 @@
}
+// Get dataset cache.
+//Get active spatial context
+FdoRfpDatasetCache *FdoRfpConnection::GetDatasetCache()
+{
+ if( m_datasetCache.p == NULL )
+ m_datasetCache = FdoRfpDatasetCache::Create();
+
+ return FDO_SAFE_ADDREF(m_datasetCache.p);
+}
+
class FdoRfpGeometryCapabilities : public FdoIGeometryCapabilities
{
public:
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpConnection.h
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpConnection.h 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpConnection.h 2007-01-25 01:19:19 UTC (rev 77)
@@ -41,6 +41,7 @@
class FdoRfpSpatialContext;
class FdoRfpSpatialContextCollection;
class FdoRfpSchemaDataCollection;
+class FdoRfpDatasetCache;
//
// Implementation of FdoIConnection
@@ -56,6 +57,9 @@
FdoPtr<FdoRfpSpatialContextCollection> m_spatialContexts;
FdoStringP m_activeSpatialContext;
+ // Dataset cache
+ FdoPtr<FdoRfpDatasetCache> m_datasetCache;
+
//Logical feature schema
FdoFeatureSchemasP m_featureSchemas;
@@ -71,7 +75,7 @@
// The connection state
FdoConnectionState m_state;
-
+
/**
* Connection information object.
*/
@@ -224,6 +228,9 @@
// Destroy a spatial context
void DestroySpatialContext(FdoString* contextName);
+ // Fetch the dataset cache
+ FdoRfpDatasetCache *GetDatasetCache();
+
//
// Internally used helper functions
//
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpDatasetCache.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpDatasetCache.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpDatasetCache.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -28,7 +28,7 @@
#include <gdal.h>
#include <cpl_conv.h>
-const static int nOpenDatasetMaximum = 32;
+const static int nOpenDatasetMaximum = 3;
FdoRfpDatasetCache::FdoRfpDatasetCache(void)
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRaster.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRaster.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRaster.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -24,20 +24,23 @@
*/
#include "FDORFP.h"
#include "FdoRfpGeoBandRaster.h"
-#include "FdoRfpImageFactory.h"
+#include "FdoRfpDatasetCache.h"
#include "FdoRfpImage.h"
#include <gdal.h>
#include "FdoRfpKeyColor.h"
#include "FdoRfpRasterUtil.h"
+#include "FdoRfpConnection.h"
-FdoRfpGeoBandRaster::FdoRfpGeoBandRaster(FdoString* imagePath)
- : m_imagePath(imagePath), m_frameNumber(0)
+FdoRfpGeoBandRaster::FdoRfpGeoBandRaster(FdoRfpConnection *conn, FdoString* imagePath)
+ : m_connection(conn), m_imagePath(imagePath), m_frameNumber(0)
{
+ FDO_SAFE_ADDREF( conn );
}
-FdoRfpGeoBandRaster::FdoRfpGeoBandRaster(FdoString* imagePath, FdoInt32 frameNumber)
- : m_imagePath(imagePath), m_frameNumber(frameNumber)
+FdoRfpGeoBandRaster::FdoRfpGeoBandRaster(FdoRfpConnection *conn, FdoString* imagePath, FdoInt32 frameNumber)
+ : m_connection(conn), m_imagePath(imagePath), m_frameNumber(frameNumber)
{
+ FDO_SAFE_ADDREF( conn );
}
FdoRfpGeoBandRaster::~FdoRfpGeoBandRaster()
@@ -54,67 +57,13 @@
{
if (m_image == NULL)
{
- GDALDatasetH image;
-
- FdoRfpImageFactoryGdal::CreateImage(m_imagePath, image, m_frameNumber);
-
-// TODO
-#ifdef notdef
- if (image->dataModel().dataModelType() == Atil::DataModelAttributes::kRgbModel &&
- image->dataModel().bitsUsedPerPixel() != 32)
- {
- Atil::RgbModel newModel(32);
- image->setDataModel(newModel);
- }
-#endif
- m_image = FdoRfpImage::Create(image);
+ FdoPtr<FdoRfpDatasetCache> cache = m_connection->GetDatasetCache();
+ m_image = FdoRfpImage::Create( cache, m_imagePath );
}
return FDO_SAFE_ADDREF(m_image.p);
}
-#ifdef notdef
-Atil::ImageView* FdoRfpGeoBandRaster::GetViewer(FdoRfpRect bounds, int viewWidth, int viewHeight)
-{
- double resX = GetResolutionX();
- double resY = GetResolutionY();
- // figure out the scale first
- double scaleX = viewWidth * resX / bounds.GetWidth();
- double scaleY = viewHeight * resY / bounds.GetHeight();
-
- // the org point
- Atil::Point2d org = PixelToWorld(0, 0);
-
- FdoPtr<FdoRfpImage> image = GetAtilImage();
- // right top point
- Atil::Point2d rt = PixelToWorld(image->GetImage()->size().width, 0);
- // left bottom point
- Atil::Point2d lb = PixelToWorld(0, image->GetImage()->size().height);
-
- Atil::Vector2d xAxis((rt.x - org.x) * scaleX / resX, (org.y - rt.y) * scaleY / resY);
- Atil::Vector2d yAxis((lb.x - org.x) * scaleX / resX, (org.y - lb.y) * scaleY / resY);
-
- // make all ordinated relative to the lefttop of the bounds
- org.x = (org.x - bounds.m_minX) * scaleX;
- org.y = (bounds.m_maxY - org.y) * scaleY;
-
- rt.x = (rt.x - bounds.m_minX) * scaleX;
- rt.y = (bounds.m_maxY - rt.y) * scaleY;
-
- lb.x = (lb.x - bounds.m_minX) * scaleX;
- lb.y = (bounds.m_maxY - lb.y) * scaleY;
-
- Atil::ImageView* viewer;
- TRY_ATIL{
- viewer = new Atil::ImageView(*image->GetImage(), Atil::Size(viewWidth, viewHeight));
- } CATCH_ATIL;
-
- viewer->setByVectors(Atil::Point2d(org.x / resX, org.y / resY), xAxis, yAxis);
-
- return viewer;
-}
-#endif
-
bool FdoRfpGeoBandRaster::GetKeyColor(FdoPtr<FdoRfpKeyColorCollection>& keyColorColl)
{
return FdoRfpRasterUtil::GetKeyColor(m_imagePath, keyColorColl);
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRaster.h
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRaster.h 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRaster.h 2007-01-25 01:19:19 UTC (rev 77)
@@ -31,6 +31,7 @@
#include "FdoRfpRect.h"
class FdoRfpKeyColorCollection;
+class FdoRfpConnection;
//
// class forwards
@@ -43,6 +44,8 @@
// data members
//
protected:
+ FdoPtr<FdoRfpConnection> m_connection;
+
FdoPtr<FdoRfpImage> m_image;
FdoStringP m_imagePath;
int m_frameNumber;
@@ -51,8 +54,8 @@
// ctor and dtor
//
protected:
- FdoRfpGeoBandRaster(FdoString* imagePath);
- FdoRfpGeoBandRaster(FdoString* imagePath, int frameNumber);
+ FdoRfpGeoBandRaster(FdoRfpConnection* connection, FdoString* imagePath);
+ FdoRfpGeoBandRaster(FdoRfpConnection* connection, FdoString* imagePath, int frameNumber);
virtual ~FdoRfpGeoBandRaster();
private:
FdoRfpGeoBandRaster();
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRasterImp.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRasterImp.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRasterImp.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -29,22 +29,32 @@
#include <gdal.h>
// geo band raster implemenation with rotation support
-FdoRfpGeoBandRasterRot::FdoRfpGeoBandRasterRot(FdoString* imagePath,
- double insertionX, double insertionY,
- double resX, double resY,
- int width, int height,
- double rotationX, double rotationY) : FdoRfpGeoBandRaster(imagePath), m_insertionX(insertionX), m_insertionY(insertionY),
- m_resX(resX), m_resY(resY), m_width(width), m_height(height), m_rotationX(rotationX), m_rotationY(rotationY)
+FdoRfpGeoBandRasterRot::FdoRfpGeoBandRasterRot(
+ FdoRfpConnection *conn,
+ FdoString* imagePath,
+ double insertionX, double insertionY,
+ double resX, double resY,
+ int width, int height,
+ double rotationX, double rotationY) :
+ FdoRfpGeoBandRaster(conn,imagePath),
+ m_insertionX(insertionX), m_insertionY(insertionY),
+ m_resX(resX), m_resY(resY), m_width(width), m_height(height),
+ m_rotationX(rotationX), m_rotationY(rotationY)
{
}
// geo band raster implemenation with rotation support
-FdoRfpGeoBandRasterRot::FdoRfpGeoBandRasterRot(FdoString* imagePath, int frameNumber,
- double insertionX, double insertionY,
- double resX, double resY,
- int width, int height,
- double rotationX, double rotationY) : FdoRfpGeoBandRaster(imagePath, frameNumber), m_insertionX(insertionX), m_insertionY(insertionY),
- m_resX(resX), m_resY(resY), m_width(width), m_height(height), m_rotationX(rotationX), m_rotationY(rotationY)
+FdoRfpGeoBandRasterRot::FdoRfpGeoBandRasterRot(
+ FdoRfpConnection *conn,
+ FdoString* imagePath, int frameNumber,
+ double insertionX, double insertionY,
+ double resX, double resY,
+ int width, int height,
+ double rotationX, double rotationY) :
+ FdoRfpGeoBandRaster(conn, imagePath, frameNumber),
+ m_insertionX(insertionX), m_insertionY(insertionY),
+ m_resX(resX), m_resY(resY), m_width(width), m_height(height),
+ m_rotationX(rotationX), m_rotationY(rotationY)
{
}
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRasterImp.h
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRasterImp.h 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoBandRasterImp.h 2007-01-25 01:19:19 UTC (rev 77)
@@ -46,12 +46,14 @@
// ctor and dtor
//
public:
- FdoRfpGeoBandRasterRot(FdoString* imagePath,
+ FdoRfpGeoBandRasterRot(FdoRfpConnection* conn,
+ FdoString* imagePath,
double insertionX, double insertionY,
double resX, double resY,
int width, int height,
double rotationX, double rotationY);
- FdoRfpGeoBandRasterRot(FdoString* imagePath, int frameNumber,
+ FdoRfpGeoBandRasterRot(FdoRfpConnection* conn,
+ FdoString* imagePath, int frameNumber,
double insertionX, double insertionY,
double resX, double resY,
int width, int height,
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoRasterExtractor.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoRasterExtractor.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoRasterExtractor.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -30,6 +30,7 @@
#ifdef _WIN32
#include <windows.h>
#endif
+#include "FdoRfpConnection.h"
#include "FdoCommonStringUtil.h"
#include "FdoRfpRasterUtil.h"
#include "FdoRfpGeoreference.h"
@@ -86,7 +87,8 @@
#endif
// extract all the georeferenced rasters from the specified location
-void FdoRfpGeoRasterExtractor::ExtractRasters(FdoString* location,
+void FdoRfpGeoRasterExtractor::ExtractRasters(FdoRfpConnection* conn,
+ FdoString* location,
const FdoPtr<FdoRfpGeoRasterCollection>& rasters,
FdoStringP& currentCoord,
FdoRfpRect& extent,
@@ -101,7 +103,7 @@
wide_to_multibyte(mbLocation, location);
std::string location1 = mbLocation;
std::vector<std::string> files;
- FdoPtr<FdoRfpDatasetCache> datasetCache = FdoRfpDatasetCache::Create();
+ FdoPtr<FdoRfpDatasetCache> datasetCache = conn->GetDatasetCache();
// determine whethere location is a path
bool bPath = false;
@@ -211,7 +213,7 @@
for (j=0; j < frameNumber; j++)
{
FdoRfpGeoBandRasterP rasterFile = new FdoRfpGeoBandRasterRot(
- fileName, j,
+ conn, fileName, j,
geoRef->GetXInsertion(), geoRef->GetYInsertion(),
geoRef->GetXResolution(), geoRef->GetYResolution(),
width, height,
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoRasterExtractor.h
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoRasterExtractor.h 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpGeoRasterExtractor.h 2007-01-25 01:19:19 UTC (rev 77)
@@ -33,13 +33,13 @@
#include <string>
class FdoRfpGeoRasterCollection;
-class FdoRfpSpatialContext;
+class FdoRfpConnection;
class FdoRfpGeoRasterExtractor
{
public:
// extract all the georeferenced rasters from the specified location
- void ExtractRasters(FdoString* location, const FdoPtr<FdoRfpGeoRasterCollection>& rasters, FdoStringP& currentCoord, FdoRfpRect& extent, bool& bFirstRaster, FdoStringCollection* coordSystems);
+ void ExtractRasters(FdoRfpConnection *conn, FdoString* location, const FdoPtr<FdoRfpGeoRasterCollection>& rasters, FdoStringP& currentCoord, FdoRfpRect& extent, bool& bFirstRaster, FdoStringCollection* coordSystems);
private:
void _getAllFiles(const char* path, std::vector<std::string>& files);
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImage.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImage.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImage.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -22,14 +22,29 @@
* $Revision: 23 $
*
*/
+
#include "FDORFP.h"
#include "FdoRfpImage.h"
-#include "FdoRfpImageFactory.h"
+#include "FdoRfpDatasetCache.h"
-FdoRfpImage::FdoRfpImage( GDALDatasetH hDS )
+FdoRfpImage::FdoRfpImage()
{
- m_ds = hDS;
+}
+
+void FdoRfpImage::Initialize( FdoRfpDatasetCache* datasetCache, FdoStringP datasetName )
+
+{
+ m_datasetCache = FDO_SAFE_ADDREF( datasetCache );
+
+ m_datasetName = datasetName;
+
+ m_ds = NULL;
+ m_redBand = NULL;
+
+ // force opening of dataset. If this doesn't work ... yikes!
+ if( GetDS() == NULL )
+ return;
m_redBand = GDALGetRasterBand( m_ds, 1 );
@@ -61,14 +76,37 @@
m_bytesPerPixel = GDALGetDataTypeSize( m_gdalDataType ) * m_components / 8;
GDALGetBlockSize( m_redBand, &m_blockXSize, &m_blockYSize );
+
+ m_xSize = GDALGetRasterXSize( m_ds );
+ m_ySize = GDALGetRasterYSize( m_ds );
+
+ ReleaseDS();
}
FdoRfpImage::~FdoRfpImage()
{
- if( m_ds )
- FdoRfpImageFactoryGdal::DestroyImage(m_ds);
+ ReleaseDS();
}
+GDALDatasetH FdoRfpImage::GetDS()
+
+{
+ if( m_ds == NULL )
+ m_ds = m_datasetCache->LockDataset( m_datasetName, false );
+
+ return m_ds;
+}
+
+void FdoRfpImage::ReleaseDS()
+
+{
+ if( m_ds != NULL )
+ {
+ m_datasetCache->UnlockDataset( m_ds );
+ m_ds = NULL;
+ }
+}
+
FdoRfpImageCollection::FdoRfpImageCollection()
{
}
@@ -88,6 +126,3 @@
}
-
-
-
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImage.h
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImage.h 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImage.h 2007-01-25 01:19:19 UTC (rev 77)
@@ -34,38 +34,54 @@
//
#include <gdal.h>
+class FdoRfpDatasetCache;
+
class FdoRfpImage : public FdoIDisposable
{
//
// Data members
//
-public:
+private:
GDALDatasetH m_ds;
GDALRasterBandH m_redBand;
-
+
+public:
+ FdoPtr<FdoRfpDatasetCache> m_datasetCache;
+ FdoStringP m_datasetName;
+
int m_bandList[4];
int m_components;
int m_blockXSize;
int m_blockYSize;
+ int m_xSize;
+ int m_ySize;
+
int m_bytesPerPixel; // total over all components
GDALDataType m_gdalDataType;
+ GDALDatasetH GetDS();
+ void ReleaseDS();
+
//
// Constructor(s), desctrucotr, factory function(s)
//
protected:
FdoRfpImage();
- FdoRfpImage(GDALDatasetH hDS);
+
+ void Initialize( FdoRfpDatasetCache* datasetCache, FdoStringP datasetName );
+
void Dispose() { delete this; }
virtual ~FdoRfpImage(void);
public:
- static FdoRfpImage* Create(GDALDatasetH image)
+ static FdoRfpImage* Create( FdoRfpDatasetCache* datasetCache, FdoStringP datasetName )
{
- return new FdoRfpImage(image);
+ FdoRfpImage *image = new FdoRfpImage();
+ image->Initialize( datasetCache, datasetName );
+ return image;
}
};
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImageFactory.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImageFactory.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImageFactory.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -23,48 +23,4 @@
*
*/
-#include "FDORFP.h"
-#include "FdoRfpImageFactory.h"
-#include <gdal.h>
-
-
-void FdoRfpImageFactoryGdal::CreateImage(FdoString* path, GDALDatasetH &image, int frameNumber)
-{
- FdoStringP trPath( path );
-
- // TODO: Should we use frameNumber?
- image = GDALOpen( (const char *) trPath, GA_ReadOnly );
-
- if (image == NULL)
- {
- // TODO: We really ought to return the GDAL error.
- throw FdoCommandException::Create(NlsMsgGet1(GRFP_63_FAIL_LOAD_RASTER,
- "Failed to load raster file %1$ls. Unsupported format encoding or error opening file ", path));
- }
-}
-
-void FdoRfpImageFactoryGdal::DestroyImage(GDALDatasetH image)
-{
- GDALClose( image );
-}
-
-int FdoRfpImageFactoryGdal::GetImageSize(GDALDatasetH image)
-{
- GDALRasterBandH hBand;
-
- hBand = GDALGetRasterBand( image, 1 );
-
- int nBytesPerPixel =
- GDALGetDataTypeSize( GDALGetRasterDataType( hBand ) ) / 8;
-
- double dfRawImageSize;
-
- dfRawImageSize = GDALGetRasterXSize( image ) * (double) GDALGetRasterYSize( image ) * nBytesPerPixel;
-
- // TODO: Shouldn't this method return a 64 bit int?
-
- if( dfRawImageSize > /* 2GB */ 2000000000.0 )
- return 2000000000;
- else
- return (int) dfRawImageSize;
-}
+// This class no longer exists. This code will eventually be removed.
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImageFactory.h
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImageFactory.h 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpImageFactory.h 2007-01-25 01:19:19 UTC (rev 77)
@@ -23,26 +23,4 @@
*
*/
-#ifndef FDORFPIMAGEFACTORY_H
-#define FDORFPIMAGEFACTORY_H
-
-#ifdef _WIN32
-#pragma once
-#endif //_WIN32
-
-typedef void *GDALDatasetH;
-
-//
-// All image factories are defined in this header file
-//
-
-class FdoRfpImageFactoryGdal
-{
-public:
- static void CreateImage(FdoString* path, GDALDatasetH& image, int frameNumber=0);
- static void DestroyImage(GDALDatasetH image);
- static int GetImageSize(const GDALDatasetH image);
-};
-
-
-#endif
+// This class no longer exists. This code will eventually be removed.
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRaster.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRaster.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRaster.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -26,7 +26,6 @@
#include "FDORFP.h"
#include "FdoRfpBandRaster.h"
#include "FdoRfpRaster.h"
-#include "FdoRfpImageFactory.h"
#include "FdoRfpGeoRaster.h"
#include "FdoRfpRasterPropertyDictionary.h"
#include "FdoRfpStreamReaderRGB24.h"
@@ -334,4 +333,4 @@
void FdoRfpRaster::SetVerticalUnits (FdoString* units)
{
throw FdoException::Create (NlsMsgGet(GRFP_5_COMMAND_TIMEOUT_NOT_SUPPORTED, "FdoIRaster::SetVerticalUnits is not supported."));
-}
\ No newline at end of file
+}
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterCapabilities.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterCapabilities.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterCapabilities.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -67,7 +67,10 @@
case FdoRasterDataModelType_Palette:
- return false; // for now this mode is not supported.
+ if( model->GetDataType() != FdoRasterDataType_UnsignedInteger )
+ return false;
+ bands = 1;
+ break;
case FdoRasterDataModelType_Gray:
case FdoRasterDataModelType_Data:
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterPropertyDictionary.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterPropertyDictionary.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterPropertyDictionary.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -96,7 +96,8 @@
throw FdoException::Create(FdoException::NLSGetMessage(FDO_2_BADPARAMETER, "Bad parameter to method."));
FdoDataValue* rv;
- GDALColorTableH hCT = GDALGetRasterColorTable( m_raster->GetImage()->m_redBand );
+ FdoRfpImage *image = m_raster->GetImage();
+ GDALColorTableH hCT = GDALGetRasterColorTable( GDALGetRasterBand( image->GetDS(), image->m_bandList[0] ) );
int numOfEntries = 0;
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterUtil.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterUtil.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpRasterUtil.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -165,14 +165,18 @@
/// </returns>
bool FdoRfpRasterUtil::GetGeoReferenceInfo(GDALDatasetH hDS, FdoPtr<FdoRfpGeoreference>& geoRef)
{
-#ifdef notdef
- char* mbFilePath = NULL;
- wide_to_multibyte(mbFilePath, filePath);
-#endif
-
double adfGeoTransform[6];
- GDALGetGeoTransform( hDS, adfGeoTransform );
+ // For now we don't permit ungeoreferenced rasters since mapguide
+ // and map don't allow them. Issue FDO238
+ if( GDALGetGeoTransform( hDS, adfGeoTransform ) != CE_None
+ || (adfGeoTransform[0] == 0.0
+ && adfGeoTransform[1] == 1.0
+ && adfGeoTransform[2] == 0.0
+ && adfGeoTransform[3] == 0.0
+ && adfGeoTransform[4] == 0.0
+ && fabs(adfGeoTransform[5]) == 1.0) )
+ return false;
// TODO Set rotation properly!
geoRef->SetXInsertion( adfGeoTransform[0] );
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpSchemaData.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpSchemaData.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpSchemaData.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -37,7 +37,7 @@
{
}
-void FdoRfpSchemaData::_buildUp(const FdoPtr<FdoRfpSpatialContextCollection>& contexts, const FdoPtr<FdoFeatureSchema>& featureSchema, const FdoPtr<FdoGrfpPhysicalSchemaMapping>& schemaMapping)
+void FdoRfpSchemaData::_buildUp(FdoRfpConnection *conn, const FdoPtr<FdoFeatureSchema>& featureSchema, const FdoPtr<FdoGrfpPhysicalSchemaMapping>& schemaMapping)
{
m_classDatas = FdoRfpClassDataCollection::Create();
m_featureSchema = featureSchema;
@@ -52,16 +52,16 @@
FdoGrfpClassDefinitionP classMapping;
if (classesMapping != NULL)
classMapping = classesMapping->GetItem(classDefinition->GetName());
- FdoRfpClassDataP classData = FdoRfpClassData::Create(contexts, classDefinition, classMapping);
+ FdoRfpClassDataP classData = FdoRfpClassData::Create(conn, classDefinition, classMapping);
m_classDatas->Add(classData);
}
}
-FdoRfpSchemaData* FdoRfpSchemaData::Create(const FdoPtr<FdoRfpSpatialContextCollection>& contexts, const FdoPtr<FdoFeatureSchema>& featureSchema, const FdoPtr<FdoGrfpPhysicalSchemaMapping>& schemaMapping)
+FdoRfpSchemaData* FdoRfpSchemaData::Create(FdoRfpConnection *conn, const FdoPtr<FdoFeatureSchema>& featureSchema, const FdoPtr<FdoGrfpPhysicalSchemaMapping>& schemaMapping)
{
FdoRfpSchemaData* schemaData = new FdoRfpSchemaData();
- schemaData->_buildUp(contexts, featureSchema, schemaMapping);
+ schemaData->_buildUp(conn, featureSchema, schemaMapping);
return schemaData;
}
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpSchemaData.h
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpSchemaData.h 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpSchemaData.h 2007-01-25 01:19:19 UTC (rev 77)
@@ -51,7 +51,7 @@
FdoRfpSchemaData(void);
virtual ~FdoRfpSchemaData(void);
public:
- static FdoRfpSchemaData* Create(const FdoPtr<FdoRfpSpatialContextCollection>& contexts, const FdoPtr<FdoFeatureSchema>& featureSchema, const FdoPtr<FdoGrfpPhysicalSchemaMapping>& schemaMapping);
+ static FdoRfpSchemaData* Create(FdoRfpConnection *conn, const FdoPtr<FdoFeatureSchema>& featureSchema, const FdoPtr<FdoGrfpPhysicalSchemaMapping>& schemaMapping);
//
// Exposed functions
@@ -67,7 +67,7 @@
//
private:
// called by the static create
- void _buildUp(const FdoPtr<FdoRfpSpatialContextCollection>& conn, const FdoPtr<FdoFeatureSchema>& featureSchema, const FdoPtr<FdoGrfpPhysicalSchemaMapping>& schemaMapping);
+ void _buildUp(FdoRfpConnection *conn, const FdoPtr<FdoFeatureSchema>& featureSchema, const FdoPtr<FdoGrfpPhysicalSchemaMapping>& schemaMapping);
};
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpStreamReaderByTile.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpStreamReaderByTile.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/FdoRfpStreamReaderByTile.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -360,8 +360,8 @@
// If this would go off the right or bottom of the image, we may
// need to trip the read window.
- int fileXSize = GDALGetRasterXSize( m_image->m_ds );
- int fileYSize = GDALGetRasterYSize( m_image->m_ds );
+ int fileXSize = m_image->m_xSize;
+ int fileYSize = m_image->m_ySize;
int wrkBlockXSize = m_blockXSize;
int wrkBlockYSize = m_blockYSize;
@@ -416,7 +416,7 @@
wrkComponents = 3;
// Read into interleaved buffer.
- eErr = GDALDatasetRasterIO( m_image->m_ds, GF_Read,
+ eErr = GDALDatasetRasterIO( m_image->GetDS(), GF_Read,
fileWinXOff, fileWinYOff, fileWinXSize, fileWinYSize,
m_tileData, wrkBlockXSize, wrkBlockYSize,
m_gdalDataType,
@@ -429,4 +429,6 @@
multibyte_to_wide( msg, CPLGetLastErrorMsg() );
throw FdoException::Create( msg );
}
+
+ m_image->ReleaseDS();
}
Modified: branches/3.2.x/Providers/GDAL/Src/Provider/RFP.vcproj
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/Provider/RFP.vcproj 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/Provider/RFP.vcproj 2007-01-25 01:19:19 UTC (rev 77)
@@ -309,10 +309,6 @@
>
</File>
<File
- RelativePath="FdoRfpImageFactory.cpp"
- >
- </File>
- <File
RelativePath="FdoRfpKeyColor.cpp"
>
</File>
Modified: branches/3.2.x/Providers/GDAL/Src/UnitTest/RfpTestThorough.cpp
===================================================================
--- branches/3.2.x/Providers/GDAL/Src/UnitTest/RfpTestThorough.cpp 2007-01-18 15:46:43 UTC (rev 76)
+++ branches/3.2.x/Providers/GDAL/Src/UnitTest/RfpTestThorough.cpp 2007-01-25 01:19:19 UTC (rev 77)
@@ -489,7 +489,7 @@
// palette
dm->SetDataModelType(FdoRasterDataModelType_Palette);
dm->SetBitsPerPixel(8);
- FDO_CPPUNIT_ASSERT (capabilities->SupportsDataModel(dm) == false);
+ FDO_CPPUNIT_ASSERT (capabilities->SupportsDataModel(dm) == true);
dm->SetBitsPerPixel(24);
FDO_CPPUNIT_ASSERT (capabilities->SupportsDataModel(dm) == false);
}
More information about the fdo-commits
mailing list