diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2006-06-09 19:22:52 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2006-06-09 19:22:52 +0000 |
| commit | 2e5735b6196440dd7b157b0088e61066b7b6a213 (patch) | |
| tree | cff081f6f01f96f62897e0c136c0b4f84ed2364d /sci-libs/gdal/files | |
| parent | Replace token ring patch - doh (diff) | |
| download | gentoo-2-2e5735b6196440dd7b157b0088e61066b7b6a213.tar.gz gentoo-2-2e5735b6196440dd7b157b0088e61066b7b6a213.tar.bz2 gentoo-2-2e5735b6196440dd7b157b0088e61066b7b6a213.zip | |
added upstream CVS patch for bug 134498, stable bumps for 1.3.1
(Portage version: 2.1_rc4-r5)
Diffstat (limited to 'sci-libs/gdal/files')
| -rw-r--r-- | sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch b/sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch new file mode 100644 index 000000000000..331647e0be3e --- /dev/null +++ b/sci-libs/gdal/files/gdal-1.3.2-gcc4-stl.patch @@ -0,0 +1,56 @@ +--- ogr/ogrsf_frmts/ili/ogrili2layer.cpp 2006-06-08 10:40:06.804746888 +0200 ++++ /home/furai/extProjects/Gdal/gdal_unstable/ogr/ogrsf_frmts/ili/ogrili2layer.cpp 2006-06-08 10:35:53.648232528 +0200 +@@ -1,5 +1,5 @@ + /****************************************************************************** +- * $Id: gdal-1.3.2-gcc4-stl.patch,v 1.1 2006/06/09 19:22:52 nerdboy Exp $ ++ * $Id: gdal-1.3.2-gcc4-stl.patch,v 1.1 2006/06/09 19:22:52 nerdboy Exp $ + * + * Project: Interlis 2 Translator + * Purpose: Implements OGRILI2Layer class. +@@ -28,6 +28,9 @@ + ****************************************************************************** + * + * $Log: gdal-1.3.2-gcc4-stl.patch,v $ + * Revision 1.1 2006/06/09 19:22:52 nerdboy + * added upstream CVS patch for bug 134498, stable bumps for 1.3.1 + * (Portage version: 2.1_rc4-r5) + * ++ * Revision 1.5 2006/06/06 17:49:07 pka ++ * STL compatibility (Bug 1178) ++ * + * Revision 1.4 2005/11/21 14:56:31 pka + * Fix for call of GetNextFeature without ResetReading (Interlis 2) + * Fix for polygonizer crash on Linux with GEOS 2.1.3 (Interlis 1) +@@ -47,7 +50,7 @@ + #include "cpl_conv.h" + #include "cpl_string.h" + +-CPL_CVSID("$Id: gdal-1.3.2-gcc4-stl.patch,v 1.1 2006/06/09 19:22:52 nerdboy Exp $"); ++CPL_CVSID("$Id: gdal-1.3.2-gcc4-stl.patch,v 1.1 2006/06/09 19:22:52 nerdboy Exp $"); + + /************************************************************************/ + /* OGRILI2Layer() */ +@@ -73,7 +76,6 @@ + poFeatureDefn->SetGeomType( eReqType ); + + bWriter = bWriterIn; +- listFeatureIt = 0; + } + + /************************************************************************/ +@@ -116,6 +118,7 @@ + + OGRErr OGRILI2Layer::SetFeature (OGRFeature *poFeature) { + listFeature.push_back(poFeature); ++ if (listFeature.size() == 1) ResetReading(); + return OGRERR_NONE; + } + +@@ -132,7 +135,6 @@ + /************************************************************************/ + + OGRFeature *OGRILI2Layer::GetNextFeature() { +- if (listFeatureIt == 0) listFeatureIt = listFeature.begin(); + if (listFeatureIt != listFeature.end()) + return *(listFeatureIt++); + return NULL; |