[geos-commits] r2127 - in trunk: . build/msvc80
build/msvc80/geos_lib source/geom source/geom/util
source/headers/geos source/headers/geos/geom
source/headers/geos/noding
source/headers/geos/operation/overlay source/index/quadtree
source/noding source/noding/snapround
source/operation/overlay source/precision source/simplify
tests/unit/geom
svn_geos at osgeo.org
svn_geos at osgeo.org
Tue May 20 17:25:21 EDT 2008
Author: mloskot
Date: 2008-05-20 17:25:21 -0400 (Tue, 20 May 2008)
New Revision: 2127
Modified:
trunk/ChangeLog
trunk/bootstrap.bat
trunk/build/msvc80/geos.sln
trunk/build/msvc80/geos_lib/geos_lib.vcproj
trunk/source/geom/GeometryComponentFilter.cpp
trunk/source/geom/PrecisionModel.cpp
trunk/source/geom/util/GeometryTransformer.cpp
trunk/source/headers/geos/geom/BinaryOp.h
trunk/source/headers/geos/noding/MCIndexNoder.h
trunk/source/headers/geos/noding/Octant.h
trunk/source/headers/geos/noding/ScaledNoder.h
trunk/source/headers/geos/operation/overlay/PointBuilder.h
trunk/source/headers/geos/util.h
trunk/source/index/quadtree/NodeBase.cpp
trunk/source/noding/ScaledNoder.cpp
trunk/source/noding/SegmentString.cpp
trunk/source/noding/snapround/MCIndexPointSnapper.cpp
trunk/source/operation/overlay/FuzzyPointLocator.cpp
trunk/source/operation/overlay/OverlayOp.cpp
trunk/source/precision/CommonBitsRemover.cpp
trunk/source/precision/GeometrySnapper.cpp
trunk/source/simplify/DouglasPeuckerSimplifier.cpp
trunk/tests/unit/geom/DimensionTest.cpp
Log:
* source\headers\geos\util.h: Add UNREFERENCED_PARAMETER macro.
* source\geom\PrecisionModel.cpp, source\geom\GeometryComponentFilter.cpp,
source\geom\util\GeometryTransformer.cpp, source\precision\GeometrySnapper.cpp,
source\precision\CommonBitsRemover.cpp, source\simplify\DouglasPeuckerSimplifier.cpp,
source\operation\overlay\OverlayOp.cpp, source\operation\overlay\FuzzyPointLocator.cpp,
source\index\quadtree\NodeBase.cpp, source\headers\geos\geom\BinaryOp.h,
source\headers\geos\operation\overlay\PointBuilder.h,
source\headers\geos\noding\MCIndexNoder.h,
source\headers\geos\noding\ScaledNoder.h, source\headers\geos\noding\Octant.h,
source\noding\ScaledNoder.cpp, source\noding\snapround\MCIndexPointSnapper.cpp,
source\noding\SegmentString.cpp, tests\unit\geom\DimensionTest.cpp: Use UNREFERENCED_PARAMETER macro to get rid of C4100 warning when building with Visual C++.
* build\msvc80\geos_lib\geos_lib.vcproj: Remove non-existing source files.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/ChangeLog 2008-05-20 21:25:21 UTC (rev 2127)
@@ -7,6 +7,19 @@
* source/makefile.vc: Do not make copies of 3 dynamic headers but let
users to use bootstrap.bat instead. Fixed compilation error by removing
non-existing file entry: source\geom\prep\PreparedPolygonLineIntersection.cpp
+ * source\headers\geos\util.h: Add UNREFERENCED_PARAMETER macro.
+ * source\geom\PrecisionModel.cpp, source\geom\GeometryComponentFilter.cpp,
+ source\geom\util\GeometryTransformer.cpp, source\precision\GeometrySnapper.cpp,
+ source\precision\CommonBitsRemover.cpp, source\simplify\DouglasPeuckerSimplifier.cpp,
+ source\operation\overlay\OverlayOp.cpp, source\operation\overlay\FuzzyPointLocator.cpp,
+ source\index\quadtree\NodeBase.cpp, source\headers\geos\geom\BinaryOp.h,
+ source\headers\geos\operation\overlay\PointBuilder.h,
+ source\headers\geos\noding\MCIndexNoder.h,
+ source\headers\geos\noding\ScaledNoder.h, source\headers\geos\noding\Octant.h,
+ source\noding\ScaledNoder.cpp, source\noding\snapround\MCIndexPointSnapper.cpp,
+ source\noding\SegmentString.cpp, tests\unit\geom\DimensionTest.cpp:
+ Use UNREFERENCED_PARAMETER macro to get rid of C4100 warning when building with Visual C++.
+ * build\msvc80\geos_lib\geos_lib.vcproj: Remove non-existing source files.
--------- GEOS-3.0.0 release [2007-12-21] --------------------------
Property changes on: trunk/bootstrap.bat
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/build/msvc80/geos.sln
===================================================================
--- trunk/build/msvc80/geos.sln 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/build/msvc80/geos.sln 2008-05-20 21:25:21 UTC (rev 2127)
@@ -16,6 +16,7 @@
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8584EE81-D4E9-4EC7-ABF2-389E5F9D0107}"
ProjectSection(SolutionItems) = preProject
..\..\AUTHORS = ..\..\AUTHORS
+ ..\..\bootstrap.bat = ..\..\bootstrap.bat
..\..\ChangeLog = ..\..\ChangeLog
..\..\COPYING = ..\..\COPYING
..\..\INSTALL = ..\..\INSTALL
Modified: trunk/build/msvc80/geos_lib/geos_lib.vcproj
===================================================================
--- trunk/build/msvc80/geos_lib/geos_lib.vcproj 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/build/msvc80/geos_lib/geos_lib.vcproj 2008-05-20 21:25:21 UTC (rev 2127)
@@ -726,10 +726,6 @@
>
</File>
<File
- RelativePath="..\..\..\source\geom\prep\PreparedPolygonLineIntersection.cpp"
- >
- </File>
- <File
RelativePath="..\..\..\source\geom\prep\PreparedPolygonPredicate.cpp"
>
</File>
Modified: trunk/source/geom/GeometryComponentFilter.cpp
===================================================================
--- trunk/source/geom/GeometryComponentFilter.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/geom/GeometryComponentFilter.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -18,6 +18,7 @@
#include <geos/geom/GeometryComponentFilter.h>
#include <geos/geom/Geometry.h>
+#include <geos/util.h>
namespace geos {
namespace geom { // geos::geom
@@ -28,6 +29,7 @@
void GeometryComponentFilter::filter_ro(const Geometry *geom)
{
+ UNREFERENCED_PARAMETER(geom);
//assert(0);
}
Modified: trunk/source/geom/PrecisionModel.cpp
===================================================================
--- trunk/source/geom/PrecisionModel.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/geom/PrecisionModel.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -21,6 +21,7 @@
#include <geos/geom/Coordinate.h>
#include <geos/util/IllegalArgumentException.h>
#include <geos/util/math.h>
+#include <geos/util.h>
#include <sstream>
#include <string>
@@ -109,6 +110,9 @@
:
modelType(FIXED)
{
+ UNREFERENCED_PARAMETER(newOffsetX);
+ UNREFERENCED_PARAMETER(newOffsetY);
+
#if GEOS_DEBUG
cerr<<"PrecisionModel["<<this<<"] ctor(scale,offsets)"<<endl;
#endif
Modified: trunk/source/geom/util/GeometryTransformer.cpp
===================================================================
--- trunk/source/geom/util/GeometryTransformer.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/geom/util/GeometryTransformer.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -31,6 +31,7 @@
#include <geos/geom/LinearRing.h>
#include <geos/geom/GeometryCollection.h>
#include <geos/util/IllegalArgumentException.h>
+#include <geos/util.h>
#include <typeinfo>
#include <cassert>
@@ -114,6 +115,7 @@
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
#if GEOS_DEBUG
std::cerr << "GeometryTransformer::transformCoordinates(CoordinateSequence " << coords <<", Geometry " << parent << ");" << std::endl;
#endif
@@ -126,6 +128,7 @@
const Point* geom,
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
#if GEOS_DEBUG
std::cerr << "GeometryTransformer::transformPoint(Point " << geom <<", Geometry " << parent << ");" << std::endl;
@@ -142,6 +145,7 @@
const MultiPoint* geom,
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
#if GEOS_DEBUG
std::cerr << "GeometryTransformer::transformMultiPoint(MultiPoint " << geom <<", Geometry " << parent << ");" << std::endl;
@@ -172,6 +176,7 @@
const LinearRing* geom,
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
#if GEOS_DEBUG
std::cerr << "GeometryTransformer::transformLinearRing(LinearRing " << geom <<", Geometry " << parent << ");" << std::endl;
@@ -197,6 +202,7 @@
const LineString* geom,
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
#if GEOS_DEBUG
std::cerr << "GeometryTransformer::transformLineString(LineString " << geom <<", Geometry " << parent << ");" << std::endl;
@@ -212,6 +218,7 @@
const MultiLineString* geom,
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
#if GEOS_DEBUG
std::cerr << "GeometryTransformer::transformMultiLineString(MultiLineString " << geom <<", Geometry " << parent << ");" << std::endl;
@@ -242,6 +249,7 @@
const Polygon* geom,
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
#if GEOS_DEBUG
std::cerr << "GeometryTransformer::transformPolygon(Polygon " << geom <<", Geometry " << parent << ");" << std::endl;
@@ -314,6 +322,7 @@
const MultiPolygon* geom,
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
#if GEOS_DEBUG
std::cerr << "GeometryTransformer::transformMultiPolygon(MultiPolygon " << geom <<", Geometry " << parent << ");" << std::endl;
@@ -344,6 +353,7 @@
const GeometryCollection* geom,
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
#if GEOS_DEBUG
std::cerr << "GeometryTransformer::transformGeometryCollection(GeometryCollection " << geom <<", Geometry " << parent << ");" << std::endl;
Modified: trunk/source/headers/geos/geom/BinaryOp.h
===================================================================
--- trunk/source/headers/geos/geom/BinaryOp.h 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/headers/geos/geom/BinaryOp.h 2008-05-20 21:25:21 UTC (rev 2127)
@@ -48,12 +48,13 @@
#include <geos/geom/Geometry.h>
#include <geos/geom/PrecisionModel.h>
-#include <geos/util/TopologyException.h>
#include <geos/precision/CommonBitsRemover.h>
#include <geos/precision/SimpleGeometryPrecisionReducer.h>
#include <geos/precision/GeometrySnapper.h>
#include <geos/simplify/TopologyPreservingSimplifier.h>
#include <geos/operation/valid/IsValidOp.h>
+#include <geos/util/TopologyException.h>
+#include <geos/util.h>
#include <memory> // for auto_ptr
@@ -256,6 +257,7 @@
}
catch (const util::TopologyException& ex)
{
+ UNREFERENCED_PARAMETER(ex);
#if GEOS_DEBUG_BINARYOP
std::cerr << "CBR: " << ex.what() << std::endl;
#endif
@@ -285,6 +287,7 @@
}
catch (const util::TopologyException& ex)
{
+ UNREFERENCED_PARAMETER(ex);
#if GEOS_DEBUG_BINARYOP
std::cerr << "SNAP: " << ex.what() << std::endl;
#endif
Modified: trunk/source/headers/geos/noding/MCIndexNoder.h
===================================================================
--- trunk/source/headers/geos/noding/MCIndexNoder.h 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/headers/geos/noding/MCIndexNoder.h 2008-05-20 21:25:21 UTC (rev 2127)
@@ -21,6 +21,7 @@
#include <geos/index/chain/MonotoneChainOverlapAction.h> // for inheritance
#include <geos/noding/SinglePassNoder.h> // for inheritance
#include <geos/index/strtree/STRtree.h> // for composition
+#include <geos/util.h>
#include <vector>
#include <iostream>
@@ -96,7 +97,11 @@
void overlap(index::chain::MonotoneChain* mc1, int start1,
index::chain::MonotoneChain* mc2, int start2);
- void overlap(geom::LineSegment* s1, geom::LineSegment* s2) { assert(0); }
+ void overlap(geom::LineSegment* s1, geom::LineSegment* s2)
+ {
+ UNREFERENCED_PARAMETER(s1);
+ assert(0);
+ }
};
};
Modified: trunk/source/headers/geos/noding/Octant.h
===================================================================
--- trunk/source/headers/geos/noding/Octant.h 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/headers/geos/noding/Octant.h 2008-05-20 21:25:21 UTC (rev 2127)
@@ -17,6 +17,7 @@
#define GEOS_NODING_OCTANT_H
#include <geos/inline.h>
+#include <geos/util.h>
// Forward declarations
namespace geos {
@@ -59,7 +60,10 @@
* Returns the octant of a directed line segment from p0 to p1.
*/
static int octant(const geom::Coordinate& p0, const geom::Coordinate& p1);
- static int octant(const geom::Coordinate* p0, const geom::Coordinate* p1) {
+
+ static int octant(const geom::Coordinate* p0, const geom::Coordinate* p1)
+ {
+ UNREFERENCED_PARAMETER(p0);
return octant(*p1, *p1);
}
};
Modified: trunk/source/headers/geos/noding/ScaledNoder.h
===================================================================
--- trunk/source/headers/geos/noding/ScaledNoder.h 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/headers/geos/noding/ScaledNoder.h 2008-05-20 21:25:21 UTC (rev 2127)
@@ -24,9 +24,9 @@
#include <vector>
#include <geos/inline.h>
-
#include <geos/noding/Noder.h> // for inheritance
//#include <geos/geom/CoordinateFilter.h> // for inheritance
+#include <geos/util.h>
// Forward declarations
namespace geos {
@@ -102,7 +102,11 @@
//void filter(Coordinate& c);
- void filter_ro(const geom::Coordinate* c) { assert(0); }
+ void filter_ro(const geom::Coordinate* c)
+ {
+ UNREFERENCED_PARAMETER(c);
+ assert(0);
+ }
void filter_rw(geom::Coordinate* c) const;
Modified: trunk/source/headers/geos/operation/overlay/PointBuilder.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/PointBuilder.h 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/headers/geos/operation/overlay/PointBuilder.h 2008-05-20 21:25:21 UTC (rev 2127)
@@ -18,6 +18,7 @@
#include <geos/geom/GeometryFactory.h> // for inlines
#include <geos/operation/overlay/OverlayOp.h> // for OpCode enum
+#include <geos/util.h>
#include <vector>
@@ -81,7 +82,9 @@
op(newOp),
geometryFactory(newGeometryFactory),
resultPointList(new std::vector<geom::Point *>())
- {}
+ {
+ UNREFERENCED_PARAMETER(newPtLocator);
+ }
/**
* @return a list of the Points in the result of the specified
Modified: trunk/source/headers/geos/util.h
===================================================================
--- trunk/source/headers/geos/util.h 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/headers/geos/util.h 2008-05-20 21:25:21 UTC (rev 2127)
@@ -32,4 +32,12 @@
#include <geos/util/GeometricShapeFactory.h>
//#include <geos/util/math.h>
+//
+// Private macros definition
+//
+
+#ifndef UNREFERENCED_PARAMETER
+#define UNREFERENCED_PARAMETER(p) (p)
+#endif
+
#endif // GEOS_UTIL_H
Modified: trunk/source/index/quadtree/NodeBase.cpp
===================================================================
--- trunk/source/index/quadtree/NodeBase.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/index/quadtree/NodeBase.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -19,6 +19,7 @@
#include <geos/index/ItemVisitor.h>
#include <geos/geom/Envelope.h>
#include <geos/geom/Coordinate.h>
+#include <geos/util.h>
#include <sstream>
#include <vector>
@@ -192,6 +193,8 @@
void
NodeBase::visitItems(const Envelope* searchEnv, ItemVisitor& visitor)
{
+ UNREFERENCED_PARAMETER(searchEnv);
+
// would be nice to filter items based on search envelope, but can't
// until they contain an envelope
for (vector<void*>::iterator i=items->begin(), e=items->end();
Modified: trunk/source/noding/ScaledNoder.cpp
===================================================================
--- trunk/source/noding/ScaledNoder.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/noding/ScaledNoder.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -23,6 +23,7 @@
#include <geos/noding/ScaledNoder.h>
#include <geos/noding/SegmentString.h>
#include <geos/util/math.h>
+#include <geos/util.h>
#include <functional>
#include <vector>
@@ -104,7 +105,12 @@
#endif
}
- void filter_ro(const geom::Coordinate* c) { assert(0); }
+ void filter_ro(const geom::Coordinate* c)
+ {
+ UNREFERENCED_PARAMETER(c);
+ assert(0);
+ }
+
void filter_rw(geom::Coordinate* c) const {
c->x = c->x / sn.scaleFactor + sn.offsetX;
c->y = c->y / sn.scaleFactor + sn.offsetY;
Modified: trunk/source/noding/SegmentString.cpp
===================================================================
--- trunk/source/noding/SegmentString.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/noding/SegmentString.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -54,6 +54,8 @@
SegmentString::addIntersection(LineIntersector *li, unsigned int segmentIndex,
int geomIndex, int intIndex)
{
+ UNREFERENCED_PARAMETER(geomIndex);
+
const Coordinate &intPt=li->getIntersection(intIndex);
addIntersection(intPt, segmentIndex);
}
Modified: trunk/source/noding/snapround/MCIndexPointSnapper.cpp
===================================================================
--- trunk/source/noding/snapround/MCIndexPointSnapper.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/noding/snapround/MCIndexPointSnapper.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -25,6 +25,7 @@
#include <geos/geom/Envelope.h>
#include <geos/index/chain/MonotoneChainSelectAction.h>
#include <geos/index/chain/MonotoneChain.h>
+#include <geos/util.h>
#include <algorithm>
@@ -69,7 +70,10 @@
isNodeAddedVar = SimpleSnapRounder::addSnappedNode(hotPixel, ss, startIndex);
}
- void select(LineSegment* ls) {}
+ void select(LineSegment* ls)
+ {
+ UNREFERENCED_PARAMETER(ls);
+ }
};
Modified: trunk/source/operation/overlay/FuzzyPointLocator.cpp
===================================================================
--- trunk/source/operation/overlay/FuzzyPointLocator.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/operation/overlay/FuzzyPointLocator.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -23,6 +23,7 @@
#include <geos/geom/Point.h> // for Point upcast
#include <geos/geom/GeometryFactory.h>
#include <geos/geom/Location.h> // for Location::Value enum
+#include <geos/util.h>
#include <cassert>
#include <functional>
@@ -60,6 +61,8 @@
std::auto_ptr<Geometry>
FuzzyPointLocator::extractLineWork(const geom::Geometry& geom)
{
+ UNREFERENCED_PARAMETER(geom);
+
vector<Geometry*>* lineGeoms = new vector<Geometry*>();
try { // geoms array will leak if an exception is thrown
@@ -79,7 +82,6 @@
} catch (...) { // avoid leaks
for (size_t i=0, n=lineGeoms->size(); i<n; ++i)
{
-
delete (*lineGeoms)[i];
}
delete lineGeoms;
@@ -92,6 +94,8 @@
std::auto_ptr<Geometry>
FuzzyPointLocator::getLineWork(const geom::Geometry& geom)
{
+ UNREFERENCED_PARAMETER(geom);
+
vector<Geometry*>* lineGeoms = new vector<Geometry*>();
try { // geoms array will leak if an exception is thrown
Modified: trunk/source/operation/overlay/OverlayOp.cpp
===================================================================
--- trunk/source/operation/overlay/OverlayOp.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/operation/overlay/OverlayOp.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -898,7 +898,6 @@
assert(resultGeom);
-
#ifdef ENABLE_OTHER_OVERLAY_RESULT_VALIDATORS
if ( opCode == opINTERSECTION
@@ -947,6 +946,9 @@
}
// Add your tests here
+
+#else
+ UNREFERENCED_PARAMETER(opCode);
#endif
#ifdef ENABLE_OVERLAY_RESULT_VALIDATOR
Modified: trunk/source/precision/CommonBitsRemover.cpp
===================================================================
--- trunk/source/precision/CommonBitsRemover.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/precision/CommonBitsRemover.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -20,6 +20,7 @@
#include <geos/geom/CoordinateFilter.h>
#include <geos/geom/Coordinate.h>
#include <geos/geom/Geometry.h>
+#include <geos/util.h>
#include <cassert>
@@ -49,7 +50,11 @@
trans(newTrans)
{}
- void filter_ro(const geom::Coordinate *coord){ assert(0); }; //Not used
+ void filter_ro(const geom::Coordinate *coord) //Not used
+ {
+ UNREFERENCED_PARAMETER(coord);
+ assert(0);
+ };
void filter_rw(geom::Coordinate *coord) const
{
@@ -67,7 +72,8 @@
void filter_rw(geom::Coordinate *coord) const
{
- // CommonCoordinateFilter is a read-only filter
+ // CommonCoordinateFilter is a read-only filter
+ UNREFERENCED_PARAMETER(coord);
assert(0);
}
Modified: trunk/source/precision/GeometrySnapper.cpp
===================================================================
--- trunk/source/precision/GeometrySnapper.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/precision/GeometrySnapper.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -23,10 +23,11 @@
#include <geos/geom/util/GeometryTransformer.h> // inherit. of SnapTransformer
#include <geos/geom/CoordinateSequence.h>
#include <geos/geom/Coordinate.h>
-#include <geos/util/UniqueCoordinateArrayFilter.h>
#include <geos/geom/GeometryFactory.h>
#include <geos/geom/CoordinateSequenceFactory.h>
#include <geos/geom/PrecisionModel.h>
+#include <geos/util/UniqueCoordinateArrayFilter.h>
+#include <geos/util.h>
#include <vector>
#include <memory>
@@ -76,6 +77,7 @@
const CoordinateSequence* coords,
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
return snapLine(coords);
}
Modified: trunk/source/simplify/DouglasPeuckerSimplifier.cpp
===================================================================
--- trunk/source/simplify/DouglasPeuckerSimplifier.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/source/simplify/DouglasPeuckerSimplifier.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -25,7 +25,8 @@
#include <geos/geom/GeometryFactory.h>
#include <geos/geom/CoordinateSequenceFactory.h>
#include <geos/geom/util/GeometryTransformer.h> // for DPTransformer inheritance
-#include <geos/util/IllegalArgumentException.h>
+#include <geos/util/IllegalArgumentException.h>
+#include <geos/util.h>
#include <memory> // for auto_ptr
#include <cassert>
@@ -102,6 +103,8 @@
const CoordinateSequence* coords,
const Geometry* parent)
{
+ UNREFERENCED_PARAMETER(parent);
+
const Coordinate::Vect* inputPts = coords->toVector();
assert(inputPts);
Modified: trunk/tests/unit/geom/DimensionTest.cpp
===================================================================
--- trunk/tests/unit/geom/DimensionTest.cpp 2008-05-20 20:45:08 UTC (rev 2126)
+++ trunk/tests/unit/geom/DimensionTest.cpp 2008-05-20 21:25:21 UTC (rev 2127)
@@ -7,6 +7,7 @@
// GEOS
#include <geos/geom/Dimension.h>
#include <geos/util/IllegalArgumentException.h>
+#include <geos/util.h>
namespace tut
{
@@ -51,6 +52,7 @@
{
// Just compile-time test
geos::geom::Dimension dim;
+ UNREFERENCED_PARAMETER(dim);
}
// Test of toDimensionSymbol()
More information about the geos-commits
mailing list