Changeset 14776

Timestamp:

06/27/08 23:37:52 (2 months ago)

Author:

warmerdam

Message:

fix up a few details

Files:

• trunk/gdal/alg/gdalproximity.cpp (modified) (14 diffs)

trunk/gdal/alg/gdalproximity.cpp

@@ -36 +36 @@
-static CPLErr
-ProcessProximityLine( GInt32 *panSrcScanline, int *panNearX, int *panNearY, 
-int
+double
-                      float *pafProximity,
-                      int nTargetValues, int *panTargetValues );
@@ -82 +82 @@
-The NODATA value to use on the output band for pixels that are
-beyond MAXDIST.  If not provided, the hProximityBand will be
-25
+6553
-
-  FIXED_BUF_VAL=n
@@ -99 +99 @@
-
-{
-MaxDist, nXSize, nYSize, i
+XSize, nYSize, i, bFixedBufVal = FALSE
-    const char *pszOpt;
+    double dfMaxDist;
+    double dfFixedBufVal;
-
-    VALIDATE_POINTER1( hSrcBand, "GDALComputeProximity", CE_Failure );
@@ -109 +111 @@
-
-/* -------------------------------------------------------------------- */
+/*      Are we using pixels or georeferenced coordinates for distances? */
+/* -------------------------------------------------------------------- */
+    double dfDistMult = 1.0;
+    pszOpt = CSLFetchNameValue( papszOptions, "DISTUNITS" );
+    if( pszOpt )
+    {
+        if( EQUAL(pszOpt,"GEO") )
+        {
+            GDALDatasetH hSrcDS = GDALGetBandDataset( hSrcBand );
+            if( hSrcDS )
+            {
+                double adfGeoTransform[6];
+
+                GDALGetGeoTransform( hSrcDS, adfGeoTransform );
+                if( ABS(adfGeoTransform[1]) != ABS(adfGeoTransform[5]) )
+                    CPLError( CE_Warning, CPLE_AppDefined,
+                              "Pixels not square, distances will be inaccurate." );
+                dfDistMult = ABS(adfGeoTransform[1]);
+            }
+        }
+        else if( !EQUAL(pszOpt,"PIXEL") )
+        {
+            CPLError( CE_Failure, CPLE_AppDefined,
+                      "Unrecognised DISTUNITS value '%s', should be GEO or PIXEL.",
+                      pszOpt );
+            return CE_Failure;
+        }
+    }
+
+/* -------------------------------------------------------------------- */
-/*      What is our maxdist value?                                      */
-/* -------------------------------------------------------------------- */
-    pszOpt = CSLFetchNameValue( papszOptions, "MAXDIST" );
-    if( pszOpt )
-nMaxDist = atoi(pszOpt)
+dfMaxDist = atof(pszOpt) / dfDistMult
-    else
-n
+df
-
-/* -------------------------------------------------------------------- */
@@ -128 +160 @@
-                  "Source and proximity bands are not the same size." );
-        return CE_Failure;
+    }
+
+/* -------------------------------------------------------------------- */
+/*      Get output NODATA value.                                        */
+/* -------------------------------------------------------------------- */
+    float fNoDataValue;
+    pszOpt = CSLFetchNameValue( papszOptions, "NODATA" );
+    if( pszOpt != NULL )
+        fNoDataValue = atof(pszOpt);
+    else
+    {
+        int bSuccess;
+
+        fNoDataValue = GDALGetRasterNoDataValue( hProximityBand, &bSuccess );
+        if( !bSuccess )
+            fNoDataValue = 65535.0;
+    }
+    
+/* -------------------------------------------------------------------- */
+/*      Is there a fixed value we wish to force the buffer area to?     */
+/* -------------------------------------------------------------------- */
+    pszOpt = CSLFetchNameValue( papszOptions, "FIXED_BUF_VAL" );
+    if( pszOpt )
+    {
+        dfFixedBufVal = atof(pszOpt);
+        bFixedBufVal = TRUE;
-    }
-
@@ -184 +242 @@
-
-/* -------------------------------------------------------------------- */
-orward over all the lines.     
+rom top to bottom of the image.
-/* -------------------------------------------------------------------- */
-    int iLine;
@@ -194 +252 @@
-    for( iLine = 0; eErr == CE_None && iLine < nYSize; iLine++ )
-    {
+        // Read for target values.
-        eErr = GDALRasterIO( hSrcBand, GF_Read, 0, iLine, nXSize, 1, 
-                             panSrcScanline, nXSize, 1, GDT_Int32, 0, 0 );
@@ -202 +261 @@
-            pafProximity[i] = -1.0;
-
+        // Left to right
-        ProcessProximityLine( panSrcScanline, panNearX, panNearY, 
-n
+df
-                              pafProximity, nTargetValues, panTargetValues );
-
+        // Right to Left
-        ProcessProximityLine( panSrcScanline, panNearX, panNearY, 
-n
+df
-                              pafProximity, nTargetValues, panTargetValues );
-
@@ -227 +288 @@
-
-/* -------------------------------------------------------------------- */
-backward over all the lines.    
+from bottom to top of the image.
-/* -------------------------------------------------------------------- */
-    for( i = 0; i < nXSize; i++ )
@@ -249 +310 @@
-            break;
-
-Process backwards.
+Right to left
-        ProcessProximityLine( panSrcScanline, panNearX, panNearY, 
-n
+df
-                              pafProximity, nTargetValues, panTargetValues );
-
-Process backwards.
+Left to right
-        ProcessProximityLine( panSrcScanline, panNearX, panNearY, 
-n
+df
-                              pafProximity, nTargetValues, panTargetValues );
-
+        // Final post processing of distances. 
+        for( i = 0; i < nXSize; i++ )
+        {
+            if( pafProximity[i] < 0.0 )
+                pafProximity[i] = fNoDataValue;
+            else if( pafProximity[i] > 0.0 )
+            {
+                if( bFixedBufVal )
+                    pafProximity[i] = (float) dfFixedBufVal;
+                else 
+                    pafProximity[i] *= dfDistMult;
+            }
+        }
+  
-        // Write out results.
-        eErr = 
@@ -292 +367 @@
-static CPLErr
-ProcessProximityLine( GInt32 *panSrcScanline, int *panNearX, int *panNearY, 
-int n
+double df
-                      float *pafProximity,
-                      int nTargetValues, int *panTargetValues )
@@ -314 +389 @@
-    for( iPixel = iStart; iPixel != iEnd; iPixel += iStep )
-    {
-
+ = FALSE
-
-/* -------------------------------------------------------------------- */
@@ -324 +399 @@
-        {
-            int i;
+
-            for( i = 0; i < nTargetValues; i++ )
-            {
@@ -407 +483 @@
-/* -------------------------------------------------------------------- */
-        if( panNearX[iPixel] != -1 
-nMaxDist * n
+dfMaxDist * df
-            && (pafProximity[iPixel] < 0 
-                || fNearDistSq < pafProximity[iPixel] * pafProximity[iPixel]) )