|
From: Philip L. <phi...@us...> - 2006-04-21 04:35:45
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25834 Modified Files: arLabeling.c arGetCode.c Log Message: Rename AR_PIXEL_FORMAT_DEFAULT to AR_DEFAULT_PIXEL_FORMAT, fix pow2 half-res tex in gsub_lite. Index: arLabeling.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arLabeling.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** arLabeling.c 5 Apr 2006 05:47:43 -0000 1.2 --- arLabeling.c 21 Apr 2006 04:35:41 -0000 1.3 *************** *** 230,248 **** 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 --- 230,248 ---- for(j = 1; j < lysize-1; j++, pnt+=poff*2, pnt2+=2) { for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) if( *(pnt+1) * 3 <= thresh ) { ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) if( *(pnt+0) * 3 <= thresh ) { #else *************** *** 570,595 **** 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; --- 570,595 ---- 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_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) if( *(pnt+1) * 3 <= thresh ) { *(dpnt+1) = 255; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) if( *(pnt+0) * 3 <= thresh ) { *(dpnt+0) = 255; *************** *** 696,714 **** 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 --- 696,714 ---- else { *pnt2 = 0; ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) *(dpnt+1) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) *(dpnt+0) = 0; #else Index: arGetCode.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arGetCode.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** arGetCode.c 5 Apr 2006 05:47:43 -0000 1.2 --- arGetCode.c 21 Apr 2006 04:35:41 -0000 1.3 *************** *** 264,296 **** 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]; --- 264,296 ---- ext_pat2_x_index = i/xdiv; image_index = (yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT; ! #if (AR_DEFAULT_PIXEL_FORMAT == 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_DEFAULT_PIXEL_FORMAT == 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_DEFAULT_PIXEL_FORMAT == 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_DEFAULT_PIXEL_FORMAT == 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_DEFAULT_PIXEL_FORMAT == 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_DEFAULT_PIXEL_FORMAT == 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_DEFAULT_PIXEL_FORMAT == 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_DEFAULT_PIXEL_FORMAT == 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]; *************** *** 353,357 **** } 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] --- 353,357 ---- } if( xc >= 0 && xc < arImXsize && yc >= 0 && yc < arImYsize ) { ! #if (AR_DEFAULT_PIXEL_FORMAT == 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] *************** *** 366,370 **** + 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] --- 366,370 ---- + 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_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] *************** *** 379,383 **** + 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] --- 379,383 ---- + 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_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] *************** *** 392,396 **** + 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] --- 392,396 ---- + 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_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] *************** *** 405,409 **** + 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] --- 405,409 ---- + 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_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] *************** *** 418,422 **** + 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] --- 418,422 ---- + 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_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] *************** *** 431,435 **** + 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] --- 431,435 ---- + 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]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] *************** *** 444,448 **** + 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] --- 444,448 ---- + 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_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] |
