Menu
▾
▴
[artoolkit-commits] artoolkit/lib/SRC/AR arGetCode.c,1.1.1.1,1.2 arLabeling.c,1.1.1.1,1.2
|
From: Philip L. <phi...@us...> - 2006-04-05 05:47:48
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31552 Modified Files: arGetCode.c arLabeling.c Log Message: Move pixel format from gsub_lite into global namespace. Index: arGetCode.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arGetCode.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** arGetCode.c 4 Nov 2004 08:51:19 -0000 1.1.1.1 --- arGetCode.c 5 Apr 2006 05:47:43 -0000 1.2 *************** *** 263,301 **** ext_pat2_y_index = j/ydiv; ext_pat2_x_index = i/xdiv; ! image_index = (yc*arImXsize+xc)*AR_PIX_SIZE; ! #if defined(AR_PIX_FORMAT_ARGB) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+3]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+1]; ! #elif defined(AR_PIX_FORMAT_ABGR) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+3]; ! #elif defined(AR_PIX_FORMAT_BGRA) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; 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+2]; ! #elif defined(AR_PIX_FORMAT_BGR) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; 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+2]; ! #elif defined(AR_PIX_FORMAT_RGBA) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+2]; 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 defined(AR_PIX_FORMAT_RGB) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+2]; 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 defined(AR_PIX_FORMAT_2vuy) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+1]; 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+1]; ! #elif defined(AR_PIX_FORMAT_yuvs) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+0]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+0]; #else ! # error Unknown pixel format defined in config.h #endif } --- 263,301 ---- ext_pat2_y_index = j/ydiv; ext_pat2_x_index = i/xdiv; ! image_index = (yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT; ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+3]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+1]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+3]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; 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+2]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; 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+2]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+2]; 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_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+2]; 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_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+1]; 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+1]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+0]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+0]; #else ! # error Unknown default pixel format defined in config.h #endif } *************** *** 353,462 **** } if( xc >= 0 && xc < arImXsize && yc >= 0 && yc < arImYsize ) { ! #if defined(AR_PIX_FORMAT_ARGB) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE+3]; 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+2]; 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+1]; 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 defined(AR_PIX_FORMAT_ABGR) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE+1]; 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+2]; 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+3]; 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 defined(AR_PIX_FORMAT_BGRA) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE+0]; 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+1]; 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+2]; 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 defined(AR_PIX_FORMAT_BGR) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE+0]; 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+1]; 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+2]; 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 defined(AR_PIX_FORMAT_RGBA) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE+2]; 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+1]; 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+0]; 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 defined(AR_PIX_FORMAT_RGB) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE+2]; 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+1]; 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+0]; 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 defined(AR_PIX_FORMAT_2vuy) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE+1]; 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+1]; 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+1]; 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 defined(AR_PIX_FORMAT_yuvs) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE+0]; 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+0]; 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+0]; 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; #else ! # error Unknown pixel format defined in config.h #endif } --- 353,462 ---- } if( xc >= 0 && xc < arImXsize && yc >= 0 && yc < arImYsize ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+3]; 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+2]; 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+1]; 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_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+1]; 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+2]; 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+3]; 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_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+0]; 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+1]; 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+2]; 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_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+0]; 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+1]; 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+2]; 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_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+2]; 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+1]; 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+0]; 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_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+2]; 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+1]; 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+0]; 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_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+1]; 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+1]; 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+1]; 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_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) ! k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+0]; 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+0]; 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+0]; 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; #else ! # error Unknown default pixel format defined in config.h #endif } Index: arLabeling.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arLabeling.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** arLabeling.c 4 Nov 2004 08:51:25 -0000 1.1.1.1 --- arLabeling.c 5 Apr 2006 05:47:43 -0000 1.2 *************** *** 221,251 **** pnt2 = &(l_image[lxsize+1]); if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) { ! pnt = &(image[(arImXsize*2+2)*AR_PIX_SIZE]); ! poff = AR_PIX_SIZE*2; } else { ! pnt = &(image[(arImXsize+1)*AR_PIX_SIZE]); ! poff = AR_PIX_SIZE; } for(j = 1; j < lysize-1; j++, pnt+=poff*2, pnt2+=2) { for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++) { ! #if defined(AR_PIX_FORMAT_ARGB) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { ! #elif defined(AR_PIX_FORMAT_ABGR) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { ! #elif defined(AR_PIX_FORMAT_BGRA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif defined(AR_PIX_FORMAT_BGR) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif defined(AR_PIX_FORMAT_RGBA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif defined(AR_PIX_FORMAT_RGB) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif defined(AR_PIX_FORMAT_2vuy) if( *(pnt+1) * 3 <= thresh ) { ! #elif defined(AR_PIX_FORMAT_yuvs) if( *(pnt+0) * 3 <= thresh ) { #else ! # error Unknown pixel format defined in config.h #endif pnt1 = &(pnt2[-lxsize]); --- 221,251 ---- pnt2 = &(l_image[lxsize+1]); if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) { ! pnt = &(image[(arImXsize*2+2)*AR_PIX_SIZE_DEFAULT]); ! poff = AR_PIX_SIZE_DEFAULT*2; } else { ! pnt = &(image[(arImXsize+1)*AR_PIX_SIZE_DEFAULT]); ! poff = AR_PIX_SIZE_DEFAULT; } for(j = 1; j < lysize-1; j++, pnt+=poff*2, pnt2+=2) { for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) if( *(pnt+1) * 3 <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) if( *(pnt+0) * 3 <= thresh ) { #else ! # error Unknown default pixel format defined in config.h #endif pnt1 = &(pnt2[-lxsize]); *************** *** 422,426 **** } } ! if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) pnt += arImXsize*AR_PIX_SIZE; } --- 422,426 ---- } } ! if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) pnt += arImXsize*AR_PIX_SIZE_DEFAULT; } *************** *** 511,519 **** if( texXsize > 512 ) texXsize = 512; while( texYsize < arImYsize ) texYsize *= 2; ! arMalloc( arImageL, ARUint8, texXsize*texYsize*AR_PIX_SIZE ); #else ! arMalloc( arImageL, ARUint8, arImXsize*arImYsize*AR_PIX_SIZE ); #endif ! put_zero( arImageL, lxsize*lysize*AR_PIX_SIZE ); arImage = arImageL; } --- 511,519 ---- if( texXsize > 512 ) texXsize = 512; while( texYsize < arImYsize ) texYsize *= 2; ! arMalloc( arImageL, ARUint8, texXsize*texYsize*AR_PIX_SIZE_DEFAULT ); #else ! arMalloc( arImageL, ARUint8, arImXsize*arImYsize*AR_PIX_SIZE_DEFAULT ); #endif ! put_zero( arImageL, lxsize*lysize*AR_PIX_SIZE_DEFAULT ); arImage = arImageL; } *************** *** 534,542 **** if( texXsize > 512 ) texXsize = 512; while( texYsize < arImYsize ) texYsize *= 2; ! arMalloc( arImageR, ARUint8, texXsize*texYsize*AR_PIX_SIZE ); #else ! arMalloc( arImageR, ARUint8, arImXsize*arImYsize*AR_PIX_SIZE ); #endif ! put_zero( arImageR, lxsize*lysize*AR_PIX_SIZE ); } } --- 534,542 ---- if( texXsize > 512 ) texXsize = 512; while( texYsize < arImYsize ) texYsize *= 2; ! arMalloc( arImageR, ARUint8, texXsize*texYsize*AR_PIX_SIZE_DEFAULT ); #else ! arMalloc( arImageR, ARUint8, arImXsize*arImYsize*AR_PIX_SIZE_DEFAULT ); #endif ! put_zero( arImageR, lxsize*lysize*AR_PIX_SIZE_DEFAULT ); } } *************** *** 558,599 **** wk_max = 0; pnt2 = &(l_image[lxsize+1]); ! if( LorR ) dpnt = &(arImageL[(lxsize+1)*AR_PIX_SIZE]); ! else dpnt = &(arImageR[(lxsize+1)*AR_PIX_SIZE]); if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) { ! pnt = &(image[(arImXsize*2+2)*AR_PIX_SIZE]); ! poff = AR_PIX_SIZE*2; } else { ! pnt = &(image[(arImXsize+1)*AR_PIX_SIZE]); ! poff = AR_PIX_SIZE; } ! for(j = 1; j < lysize-1; j++, pnt+=poff*2, pnt2+=2, dpnt+=AR_PIX_SIZE*2) { ! for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++, dpnt+=AR_PIX_SIZE) { ! #if defined(AR_PIX_FORMAT_ARGB) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; ! #elif defined(AR_PIX_FORMAT_ABGR) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; ! #elif defined(AR_PIX_FORMAT_BGRA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif defined(AR_PIX_FORMAT_BGR) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif defined(AR_PIX_FORMAT_RGBA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif defined(AR_PIX_FORMAT_RGB) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif defined(AR_PIX_FORMAT_2vuy) if( *(pnt+1) * 3 <= thresh ) { *(dpnt+1) = 255; ! #elif defined(AR_PIX_FORMAT_yuvs) if( *(pnt+0) * 3 <= thresh ) { *(dpnt+0) = 255; #else ! # error Unknown pixel format defined in config.h #endif pnt1 = &(pnt2[-lxsize]); --- 558,599 ---- wk_max = 0; pnt2 = &(l_image[lxsize+1]); ! if( LorR ) dpnt = &(arImageL[(lxsize+1)*AR_PIX_SIZE_DEFAULT]); ! else dpnt = &(arImageR[(lxsize+1)*AR_PIX_SIZE_DEFAULT]); if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) { ! pnt = &(image[(arImXsize*2+2)*AR_PIX_SIZE_DEFAULT]); ! poff = AR_PIX_SIZE_DEFAULT*2; } else { ! pnt = &(image[(arImXsize+1)*AR_PIX_SIZE_DEFAULT]); ! poff = AR_PIX_SIZE_DEFAULT; } ! for(j = 1; j < lysize-1; j++, pnt+=poff*2, pnt2+=2, dpnt+=AR_PIX_SIZE_DEFAULT*2) { ! for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++, dpnt+=AR_PIX_SIZE_DEFAULT) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) if( *(pnt+1) * 3 <= thresh ) { *(dpnt+1) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) if( *(pnt+0) * 3 <= thresh ) { *(dpnt+0) = 255; #else ! # error Unknown default pixel format defined in config.h #endif pnt1 = &(pnt2[-lxsize]); *************** *** 696,721 **** else { *pnt2 = 0; ! #if defined(AR_PIX_FORMAT_ARGB) *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 0; ! #elif defined(AR_PIX_FORMAT_ABGR) *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 0; ! #elif defined(AR_PIX_FORMAT_BGRA) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif defined(AR_PIX_FORMAT_BGR) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif defined(AR_PIX_FORMAT_RGBA) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif defined(AR_PIX_FORMAT_RGB) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif defined(AR_PIX_FORMAT_2vuy) *(dpnt+1) = 0; ! #elif defined(AR_PIX_FORMAT_yuvs) *(dpnt+0) = 0; #else ! # error Unknown pixel format defined in config.h #endif } } ! if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) pnt += arImXsize*AR_PIX_SIZE; } --- 696,721 ---- else { *pnt2 = 0; ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) *(dpnt+1) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) *(dpnt+0) = 0; #else ! # error Unknown default pixel format defined in config.h #endif } } ! if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) pnt += arImXsize*AR_PIX_SIZE_DEFAULT; } |
