[artoolkit-commits] artoolkit/include/AR config.h.in,1.5,1.6 ar.h,1.8,1.9

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/include/AR
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7838

Modified Files:
	config.h.in ar.h 
Log Message:
Document and cleanup of labelling.

Index: ar.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/ar.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ar.h	22 May 2006 22:17:53 -0000	1.8
--- ar.h	25 May 2006 04:08:19 -0000	1.9
***************
*** 516,531 ****
  
  /**
! * \brief extracted connected component from image.
  *
! * Labeling the input image, i.e. extracted connected component from the 
! * inptu video image.
! * \param image input image
  * \param thresh lighting threshold
! * \param label_num number of detected components
! * \param area XXXBK
! * \param pos XXXBK
! * \param clip XXXBK
! * \param label_ref XXXBK
! * \return XXXBK
  */
  ARInt16 *arLabeling( ARUint8 *image, int thresh,
--- 516,531 ----
  
  /**
! * \brief extract connected components from image.
  *
! * Label the input image, i.e. extract connected components from the 
! * input video image.
! * \param image input image, as returned by arVideoGetImage()
  * \param thresh lighting threshold
! * \param label_num Ouput- number of detected components
! * \param area On return, if label_num > 0, points to an array of ints, one for each detected component.
! * \param pos On return, if label_num > 0, points to an array of doubles, one for each detected component.
! * \param clip On return, if label_num > 0, points to an array of ints, one for each detected component.
! * \param label_ref On return, if label_num > 0, points to an array of ints, one for each detected component.
! * \return returns a pointer to the labeled output image, ready for passing onto the next stage of processing.
  */
  ARInt16 *arLabeling( ARUint8 *image, int thresh,

Index: config.h.in
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config.h.in	21 Apr 2006 04:35:13 -0000	1.5
--- config.h.in	25 May 2006 04:08:19 -0000	1.6
***************
*** 142,146 ****
  #  endif
  
! #  define   DEFAULT_IMAGE_PROC_MODE     AR_IMAGE_PROC_IN_HALF
  #  define   DEFAULT_FITTING_MODE        AR_FITTING_TO_IDEAL
  #  define   DEFAULT_DRAW_MODE           AR_DRAW_BY_TEXTURE_MAPPING
--- 142,146 ----
  #  endif
  
! #  define   DEFAULT_IMAGE_PROC_MODE     AR_IMAGE_PROC_IN_FULL
  #  define   DEFAULT_FITTING_MODE        AR_FITTING_TO_IDEAL
  #  define   DEFAULT_DRAW_MODE           AR_DRAW_BY_TEXTURE_MAPPING
***************
*** 152,156 ****
  #  define   VIDEO_HALF                  1
  #  define   DEFAULT_VIDEO_SIZE          VIDEO_FULL
! #  define   DEFAULT_IMAGE_PROC_MODE     AR_IMAGE_PROC_IN_HALF
  #  define   DEFAULT_FITTING_MODE        AR_FITTING_TO_INPUT
  #  define   DEFAULT_DRAW_MODE           AR_DRAW_BY_GL_DRAW_PIXELS
--- 152,156 ----
  #  define   VIDEO_HALF                  1
  #  define   DEFAULT_VIDEO_SIZE          VIDEO_FULL
! #  define   DEFAULT_IMAGE_PROC_MODE     AR_IMAGE_PROC_IN_FULL
  #  define   DEFAULT_FITTING_MODE        AR_FITTING_TO_INPUT
  #  define   DEFAULT_DRAW_MODE           AR_DRAW_BY_GL_DRAW_PIXELS
***************
*** 168,172 ****
  #  define   DEFAULT_VIDEO_WIDTH         640
  #  define   DEFAULT_VIDEO_HEIGHT        480
! #  define   DEFAULT_IMAGE_PROC_MODE     AR_IMAGE_PROC_IN_HALF
  #  define   DEFAULT_FITTING_MODE        AR_FITTING_TO_IDEAL
  #  define   DEFAULT_DRAW_MODE           AR_DRAW_BY_TEXTURE_MAPPING
--- 168,172 ----
  #  define   DEFAULT_VIDEO_WIDTH         640
  #  define   DEFAULT_VIDEO_HEIGHT        480
! #  define   DEFAULT_IMAGE_PROC_MODE     AR_IMAGE_PROC_IN_FULL
  #  define   DEFAULT_FITTING_MODE        AR_FITTING_TO_IDEAL
  #  define   DEFAULT_DRAW_MODE           AR_DRAW_BY_TEXTURE_MAPPING