Changeset 14988

Timestamp:

Sep 23, 2007, 4:59:46 PM (19 years ago)

Author:

eugene

Message:

added APIs to define psImageMap without psImage pointer

Location:

trunk/psLib/src/imageops

Files:

• psImageBinning.c (modified) (2 diffs)
• psImageBinning.h (modified) (2 diffs)
• psImageMap.c (modified) (2 diffs)
• psImageMap.h (modified) (2 diffs)

trunk/psLib/src/imageops/psImageBinning.c

@@ -8 +8 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-22 03:05:50 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-24 02:59:46 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -88 +88 @@
         binning->nYskip = 0 - binning->nYoff;
     }
+    return;
+}
+
+void psImageBinningSetSkipByOffset(psImageBinning *binning, int col0, int row0) {
+
+    binning->nXskip = col0 - binning->nXoff;
+    binning->nYskip = row0 - binning->nYoff;
     return;
 }

trunk/psLib/src/imageops/psImageBinning.h

@@ -8 +8 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-20 23:53:48 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-24 02:59:46 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -48 +48 @@
 void psImageBinningSetScale(psImageBinning *binning, psImageBinningAlign align);
 void psImageBinningSetSkip(psImageBinning *binning, psImage *image);
+void psImageBinningSetSkipByOffset(psImageBinning *binning, int col0, int row0);
+
 psRegion psImageBinningSetFineRegion (psImageBinning *binning, psRegion ruffRegion);
 psRegion psImageBinningSetRuffRegion (psImageBinning *binning, psRegion fineRegion);

trunk/psLib/src/imageops/psImageMap.c

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-22 03:05:50 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-24 02:59:46 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -69 +69 @@
     psImageBinningSetScale (map->binning, PS_IMAGE_BINNING_CENTER);
     psImageBinningSetSkip (map->binning, map->field);
+
+    return map;
+}
+
+// allocate the image map using the psImageBinning supplied
+psImageMap *psImageMapNoImageAlloc(psImageBinning *binning, psStats *stats) {
+
+    assert (binning);
+    assert (stats);
+
+    psImageMap *map = (psImageMap*)psAlloc(sizeof(psImageMap));
+    psMemSetDeallocator(map, (psFreeFunc)psImageMapFree);
+
+    map->field   = NULL;
+    map->stats   = psMemIncrRefCounter (stats);
+    map->binning = psMemIncrRefCounter (binning);
+
+    map->map     = psImageAlloc (binning->nXruff, binning->nYruff, PS_TYPE_F32);
+    psImageInit (map->map, 0.0);
+
+    map->error   = psImageAlloc (binning->nXruff, binning->nYruff, PS_TYPE_F32);
+    psImageInit (map->error, 0.0);
 
     return map;

trunk/psLib/src/imageops/psImageMap.h

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-20 23:54:25 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-24 02:59:46 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -36 +36 @@
 psImageMap *psImageMapAlloc(psImage *field, psImageBinning *binning, psStats *stats) PS_ATTR_MALLOC;
 
+psImageMap *psImageMapNoImageAlloc(psImageBinning *binning, psStats *stats) PS_ATTR_MALLOC;
+
 bool psImageMapModifyScale(psImageMap *map, int nXruff, int nYruff);