[Teem-commit] teem/src/unrrdu tile.c,1.2,1.3 untile.c,1.1,1.2

[Gordon K. <kin...@us...>]

Update of /cvsroot/teem/teem/src/unrrdu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11912

Modified Files:
	tile.c untile.c 
Log Message:
changed semantics of ordering of the three axis arguments

Index: untile.c
===================================================================
RCS file: /cvsroot/teem/teem/src/unrrdu/untile.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** untile.c	20 May 2004 19:10:26 -0000	1.1
--- untile.c	26 May 2004 02:01:11 -0000	1.2
***************
*** 21,25 ****
  #include "privateUnrrdu.h"
  
! #define INFO "Used to do the inverse of the tile operation"
  char *_unrrdu_untileInfoL =
  (INFO
--- 21,25 ----
  #include "privateUnrrdu.h"
  
! #define INFO "Undo the action of \"unu tile\""
  char *_unrrdu_untileInfoL =
  (INFO
***************
*** 39,44 ****
    airArray *mop;
  
!   hestOptAdd(&opt, "a", "ax0 ax1 axSplit", airTypeInt, 3, 3, axes, NULL,
! 	     "axSplit is divided and merged with ax0 and ax1");
    hestOptAdd(&opt, "s", "fast, slow sizes", airTypeInt, 2, 2, size, NULL,
  	     "fast and slow axis sizes to produce as result of splitting "
--- 39,44 ----
    airArray *mop;
  
!   hestOptAdd(&opt, "a", "axMerge ax0 ax1", airTypeInt, 3, 3, axes, NULL,
! 	     "an axis is extracted from ax0 and ax1 and merged into axMerge");
    hestOptAdd(&opt, "s", "fast, slow sizes", airTypeInt, 2, 2, size, NULL,
  	     "fast and slow axis sizes to produce as result of splitting "
***************
*** 57,61 ****
    airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
    
!   if (nrrdUntile(nout, nin, axes[0], axes[1], axes[2], size[0], size[1])) {
      airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
      fprintf(stderr, "%s: error tiling nrrd:\n%s", me, err);
--- 57,61 ----
    airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
    
!   if (nrrdUntile2D(nout, nin, axes[1], axes[2], axes[0], size[0], size[1])) {
      airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
      fprintf(stderr, "%s: error tiling nrrd:\n%s", me, err);

Index: tile.c
===================================================================
RCS file: /cvsroot/teem/teem/src/unrrdu/tile.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tile.c	20 May 2004 19:11:54 -0000	1.2
--- tile.c	26 May 2004 02:01:11 -0000	1.3
***************
*** 21,25 ****
  #include "privateUnrrdu.h"
  
! #define INFO "Used to tile one axis agaist two others"
  char *_unrrdu_tileInfoL =
  (INFO
--- 21,25 ----
  #include "privateUnrrdu.h"
  
! #define INFO "Tile slices of one axis into two other axes"
  char *_unrrdu_tileInfoL =
  (INFO
***************
*** 36,40 ****
    airArray *mop;
  
!   hestOptAdd(&opt, "a", "ax0 ax1 axSplit", airTypeInt, 3, 3, axes, NULL,
  	     "axSplit is divided and merged with ax0 and ax1");
    hestOptAdd(&opt, "s", "fast, slow sizes", airTypeInt, 2, 2, size, NULL,
--- 36,40 ----
    airArray *mop;
  
!   hestOptAdd(&opt, "a", "axSplit ax0 ax1", airTypeInt, 3, 3, axes, NULL,
  	     "axSplit is divided and merged with ax0 and ax1");
    hestOptAdd(&opt, "s", "fast, slow sizes", airTypeInt, 2, 2, size, NULL,
***************
*** 54,58 ****
    airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
    
!   if (nrrdTile(nout, nin, axes[0], axes[1], axes[2], size[0], size[1])) {
      airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
      fprintf(stderr, "%s: error tiling nrrd:\n%s", me, err);
--- 54,58 ----
    airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
    
!   if (nrrdTile2D(nout, nin, axes[1], axes[2], axes[0], size[0], size[1])) {
      airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
      fprintf(stderr, "%s: error tiling nrrd:\n%s", me, err);