Changeset 15841 for trunk/psLib/src/imageops/psImageMap.c

Timestamp:

Dec 14, 2007, 3:20:03 PM (18 years ago)

Author:

Paul Price

Message:

A little bit of cleaning up, and making it so that the statistic to be used may be specified.

File:

• trunk/psLib/src/imageops/psImageMap.c (modified) (7 diffs)

trunk/psLib/src/imageops/psImageMap.c

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-13 18:28:02 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-12-15 01:20:03 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -32 +32 @@
 #include "psStats.h"
 #include "psImageBinning.h"
-#include "psImageMap.h"
 #include "psImagePixelInterpolate.h"
 #include "psImageUnbin.h"
 
+#include "psImageMap.h"
+
 static void psImageMapFree(psImageMap *map) {
 
     if (!map) return;
 
-    psFree (map->map);
-    psFree (map->error);
-    psFree (map->stats);
-    psFree (map->binning);
+    psFree(map->map);
+    psFree(map->error);
+    psFree(map->stats);
+    psFree(map->binning);
 
     return;
@@ -103 +104 @@
 }
 
-bool psImageMapModifyScale(psImageMap *map, int nXruff, int nYruff) {
-
+bool psImageMapModifyScale(psImageMap *map, int nXruff, int nYruff)
+{
     assert (map);
 
@@ -121 +122 @@
 // generate a psImageMap (or NULL) with the given number of superpixels in X and Y
 // this function returns an error if the output map has impossible holes
-bool psImageMapGenerate (psImageMap *map, psVector *x, psVector *y, psVector *f, psVector *df, float badFrac) {
+bool psImageMapGenerate(psImageMap *map, const psVector *x, const psVector *y,
+                        const psVector *f, const psVector *df, float badFrac)
+{
+    // XXX asserts
 
     psImage *mask = psImageAlloc (map->map->numCols, map->map->numRows, PS_TYPE_MASK);
@@ -253 +257 @@
 
 // using the points given, generate a map with maximum resolution that yields only good and ok pixels
-bool psImageMapGenerateScale (psImageMap *map, psVector *x, psVector *y, psVector *f, psVector *df, float badFrac) {
+bool psImageMapGenerateScale(psImageMap *map, const psVector *x, const psVector *y,
+                             const psVector *f, const psVector *df, float badFrac)
+{
+    // XXX Asserts
 
     int nXruff, nYruff;
@@ -297 +304 @@
 
 // x,y are in fractional pixel coords of the fine image (pixel center: 0.5)
-double psImageMapEval (psImageMap *map, float x, float y) {
+double psImageMapEval(const psImageMap *map, float x, float y) {
 
     double result;
@@ -306 +313 @@
 }
 
-psVector *psImageMapEvalVector (psImageMap *map, psVector *x, psVector *y) {
+psVector *psImageMapEvalVector(const psImageMap *map, const psVector *x, const psVector *y) {
 
     assert (x);