[artoolkit-commits] artoolkit/lib/SRC/AR arLabeling.c, 1.4, 1.5 arGetCode.c, 1.4, 1.5

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

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17186

Modified Files:
	arLabeling.c arGetCode.c 
Log Message:
Added support for AR_PIXEL_FORMAT_MONO.

Index: arLabeling.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arLabeling.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** arLabeling.c	25 May 2006 04:08:11 -0000	1.4
--- arLabeling.c	3 Oct 2006 21:36:05 -0000	1.5
***************
*** 236,239 ****
--- 236,241 ----
  #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB)
              if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) {
+ #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO)
+ 			if( *(pnt) <= thresh ) {
  #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy)
  			if( *(pnt+1) <= thresh ) {
***************
*** 582,585 ****
--- 584,590 ----
              if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) {
                  *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255;
+ #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO)
+ 			if( *(pnt) <= thresh ) {
+ 				*(dpnt) = 255;
  #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy)
  			if( *(pnt+1) <= thresh ) {
***************
*** 702,705 ****
--- 707,712 ----
  #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB)
                  *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0;
+ #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO)
+                 *(dpnt) = 0;
  #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy)
                  *(dpnt+1) = 0;

Index: arGetCode.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arGetCode.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** arGetCode.c	8 Jun 2006 21:34:02 -0000	1.4
--- arGetCode.c	3 Oct 2006 21:36:05 -0000	1.5
***************
*** 288,291 ****
--- 288,295 ----
                  ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1];
                  ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+0];
+ #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO)
+                 ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index];
+                 ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index];
+                 ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index];
  #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy)
                  ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+1];
***************
*** 431,434 ****
--- 435,451 ----
                     + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM);
                  ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3;
+ #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO)
+                 k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT];
+                 k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0]
+ 					+ k1*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM);
+                 ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] = (k1 > 255)? 255: k1;
+                 k2 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT];
+                 k2 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][1]
+ 					+ k2*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM);
+                 ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][1] = (k2 > 255)? 255: k2;
+                 k3 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT];
+                 k3 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2]
+ 					+ k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM);
+                 ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3;
  #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy)
                  k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+1];