Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some minor changes #3

Closed
wants to merge 3 commits into from
Closed

some minor changes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3db526
include position in XML parse error message
jef-n Oct 20, 2012
57ce0c7
vc: make OGDI include path overridable (to match OSGeo4W's default lo…
jef-n Oct 20, 2012
57205c5
include windows output files in .gitignore
jef-n Oct 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions gdal/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ config.status
libtool
cpl_config.h
*.o
*.res
*.obj
*.lib
*.exe
*.exe.manifest
*.dll
*.dll.manifest
*.exp
*.lo
*.la
.libs
Expand Down Expand Up @@ -54,3 +62,4 @@ swig/perl/osr_wrap.cpp
swig/perl/pm_to_blib
man/
html/
nmake.local
2 changes: 1 addition & 1 deletion gdal/frmts/ogdi/makefile.vc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ OBJ = ogdidataset.obj

GDAL_ROOT = ..\..

EXTRAFLAGS = -I$(OGDIDIR)/ogdi/include -I$(OGDIDIR)/include/win32 \
EXTRAFLAGS = -I$(OGDI_INCLUDE) -I$(OGDIDIR)/include/win32 \
-I$(OGDIDIR)/proj -DWIN32 -D_WINDOWS

!INCLUDE $(GDAL_ROOT)\nmake.opt
Expand Down
1 change: 1 addition & 0 deletions gdal/nmake.opt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ JPEG12_SUPPORTED = 1

# Uncomment the following and update to enable OGDI support.
#OGDIDIR = D:\warmerda\iii\devdir
#OGDI_INCLUDE = $(OGDIDIR)\include\ogdi
#OGDIVER = 31
#OGDILIB = $(OGDIDIR)\lib\$(TARGET)\ogdi$(OGDIVER).lib \
# $(OGDIDIR)\lib\$(TARGET)\zlib_ogdi$(OGDIVER).lib
Expand Down
4 changes: 2 additions & 2 deletions gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ void GMLXercesHandler::fatalError( const SAXParseException &exception)

pszErrorMessage = tr_strdup( exception.getMessage() );
CPLError( CE_Failure, CPLE_AppDefined,
"XML Parsing Error: %s\n",
pszErrorMessage );
"XML Parsing Error: %s at line %d, column %d\n",
pszErrorMessage, exception.getLineNumber(), exception.getColumnNumber() );

CPLFree( pszErrorMessage );
}
Expand Down
4 changes: 2 additions & 2 deletions gdal/ogr/ogrsf_frmts/nas/nashandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,8 +604,8 @@ void NASHandler::fatalError( const SAXParseException &exception)

pszErrorMessage = tr_strdup( exception.getMessage() );
CPLError( CE_Failure, CPLE_AppDefined,
"XML Parsing Error: %s\n",
pszErrorMessage );
"XML Parsing Error: %s at line %d, column %d\n",
pszErrorMessage, exception.getLineNumber(), exception.getColumnNumber() );

CPLFree( pszErrorMessage );
}
Expand Down
2 changes: 1 addition & 1 deletion gdal/ogr/ogrsf_frmts/ogdi/makefile.vc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
OBJ = ogrogdidriver.obj ogrogdidatasource.obj ogrogdilayer.obj

EXTRAFLAGS = -I.. -I..\.. \
-I$(OGDIDIR)/ogdi/include -I$(OGDIDIR)/include/win32 \
-I$(OGDI_INCLUDE) -I$(OGDIDIR)/include/win32 \
-I$(OGDIDIR)/proj -DWIN32 -D_WINDOWS

GDAL_ROOT = ..\..\..
Expand Down