Changeset 22476

Timestamp:

Jun 1, 2011, 4:36:41 PM (13 years ago)

Author:

jorgearevalo

Message:

Added alternative version of GDALPolygonize, named GDALFPolygonize, using 32b float buffers instead of int32 ones. The floating point numbers comparison function implemented is the last one from ​http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm. Related ticket #4005.

Location:

trunk/gdal/alg

Files:

• GNUmakefile (modified) (1 diff)
• fpolygonize.cpp (added)
• gdal_alg.h (modified) (1 diff)
• gdal_alg_priv.h (modified) (2 diffs)
• gdalrasterfpolygonenumerator.cpp (added)
• makefile.vc (modified) (1 diff)

trunk/gdal/alg/GNUmakefile

@@ -7 +7 @@
                 thinplatespline.o llrasterize.o gdalrasterize.o gdalgeoloc.o \
                 gdalgrid.o gdalcutline.o gdalproximity.o rasterfill.o \
-                gdalrasterpolygonenumerator.o gdalsievefilter.o \
-                gdalwarpkernel_opencl.o polygonize.o contour.o
+                gdalrasterpolygonenumerator.o \
+                gdalsievefilter.o gdalwarpkernel_opencl.o polygonize.o \
+                gdalrasterfpolygonenumerator.o fpolygonize.o \
+                contour.o
 
 ifeq ($(HAVE_GEOS),yes)

trunk/gdal/alg/gdal_alg.h

@@ -88 +88 @@
                 char **papszOptions,
                 GDALProgressFunc pfnProgress, 
+                void * pProgressArg );
+
+CPLErr CPL_DLL CPL_STDCALL
+GDALFPolygonize( GDALRasterBandH hSrcBand,
+                GDALRasterBandH hMaskBand,
+                OGRLayerH hOutLayer, int iPixValField,
+                char **papszOptions,
+                GDALProgressFunc pfnProgress,
                 void * pProgressArg );
 

trunk/gdal/alg/gdal_alg_priv.h

@@ -118 +118 @@
 };
 
+/************************************************************************/
+/*                          Polygon Enumerator                          */
+/*                                                                      */
+/*              Buffers has float values instead og GInt32              */
+/************************************************************************/
+class GDALRasterFPolygonEnumerator
+
+{
+private:
+    void     MergePolygon( int nSrcId, int nDstId );
+    int      NewPolygon( float fValue );
+
+public:  // these are intended to be readonly.
+
+    GInt32   *panPolyIdMap;
+    float    *pafPolyValue;
+
+    int      nNextPolygonId;
+    int      nPolyAlloc;
+
+    int      nConnectedness;
+
+public:
+             GDALRasterFPolygonEnumerator( int nConnectedness=4 );
+            ~GDALRasterFPolygonEnumerator();
+
+    void     ProcessLine( float *pafLastLineVal, float *pafThisLineVal,
+                          GInt32 *panLastLineId,  GInt32 *panThisLineId,
+                          int nXSize );
+
+    void     CompleteMerges();
+
+    void     Clear();
+};
 
 typedef void* (*GDALTransformDeserializeFunc)( CPLXMLNode *psTree );
@@ -126 +160 @@
 void GDALUnregisterTransformDeserializer(void* pData);
 
+/************************************************************************/
+/*      Float comparison function.                                      */
+/************************************************************************/
+
+/**
+ * Units in the Last Place. This specifies how big an error we are willing to
+ * accept in terms of the value of the least significant digit of the floating
+ * point number’s representation. MAX_ULPS can also be interpreted in terms of
+ * how many representable floats we are willing to accept between A and B. 
+ */
+#define MAX_ULPS 10
+
+GBool equals(float A, float B);
+
 #endif /* ndef GDAL_ALG_PRIV_H_INCLUDED */

trunk/gdal/alg/makefile.vc

@@ -20 +20 @@
         gdalgrid.obj gdalcutline.obj gdalproximity.obj rasterfill.obj \
         gdalsievefilter.obj gdalrasterpolygonenumerator.obj polygonize.obj \
-        contour.obj
+        gdalrasterfpolygonenumerator.o fpolygonize.o \
+        gdalrasterdpolygonenumerator.obj dpolygonize.obj contour.obj
 
 default:        $(OBJ)