Changeset 9864

Timestamp:

Nov 5, 2006, 4:00:40 PM (20 years ago)

Author:

magnier

Message:

added BICUBE interpolation, removed scrap code in BILINEAR interpolation

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.c (modified) (2 diffs)
• psImage.h (modified) (2 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.116 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-06 01:58:10 $
+ *  @version $Revision: 1.117 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-06 02:00:40 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -901 +901 @@
 }
 
-/*
-    fprintf (stderr, "fX: %f, fY: %f\n", fracX,fracY); \
-    fprintf (stderr, "iX: %d, iY: %d\n", floorX,floorY); \
-    fprintf (stderr, "Vmm: %f, Vom: %f, Vpm: %f\n", Vmm, Vom, Vpm); \
-    fprintf (stderr, "Vmo: %f, Voo: %f, Vpo: %f\n", Vmo, Voo, Vpo); \
-    fprintf (stderr, "Vmp: %f, Vop: %f, Vpp: %f\n", Vmp, Vop, Vpp); \
-    fprintf (stderr, "Vxm: %f, Vxp: %f\n", Vxm, Vxp); \
-    fprintf (stderr, "Vym: %f, Vyp: %f\n", Vym, Vyp); \
-    fprintf (stderr, "Vo: %f\n", Vo); \
-    fprintf (stderr, "Z_00: %f, Z_10: %f, Z_01: %f\n", Z_00, Z_10, Z_01); \
-    fprintf (stderr, "Z_20: %f, Z_11: %f, Z_02: %f\n", Z_20, Z_11, Z_02); \
-*/
-
 PSIMAGE_PIXEL_INTERPOLATE_BILINEAR(U8,psF64,U8,)
 PSIMAGE_PIXEL_INTERPOLATE_BILINEAR(U16,psF64,U16,)

trunk/psLib/src/mathtypes/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-06 01:58:10 $
+ *  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-06 02:00:40 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
     PS_INTERPOLATE_FLAT,               ///< 'flat' interpolation (nearest pixel)
     PS_INTERPOLATE_BILINEAR,           ///< bi-linear interpolation
-    PS_INTERPOLATE_BICUBE,             ///< bi-cubic interpolation with 3x3 region
+    PS_INTERPOLATE_BICUBE,             ///< bi-cubic interpolation with 3x3 region (EAM)
     PS_INTERPOLATE_LANCZOS2,           ///< Sinc interpolation with 4x4 pixel kernel
     PS_INTERPOLATE_LANCZOS3,           ///< Sinc interpolation with 6x6 pixel kernel