artoolkit-commits Mailing List for ARToolKit (Page 13)
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
Menu
▾
▴
artoolkit-commits — Log of code commits to the ARToolKit repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(65) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(5) |
Mar
(15) |
Apr
(22) |
May
|
Jun
(9) |
Jul
(108) |
Aug
(42) |
Sep
(62) |
Oct
(5) |
Nov
|
Dec
(4) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(27) |
Jun
(58) |
Jul
(8) |
Aug
(11) |
Sep
(51) |
Oct
(15) |
Nov
(12) |
Dec
(3) |
| 2007 |
Jan
(25) |
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2008 |
Jan
(2) |
Feb
(3) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(20) |
Sep
(5) |
Oct
|
Nov
|
Dec
(2) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Philip L. <phi...@us...> - 2006-04-06 05:33:36
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3960 Modified Files: gsub_lite.h Log Message: Moved some gsub_lite globals into state structure. Index: gsub_lite.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/gsub_lite.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gsub_lite.h 5 Apr 2006 05:48:43 -0000 1.7 --- gsub_lite.h 6 Apr 2006 05:33:32 -0000 1.8 *************** *** 19,22 **** --- 19,23 ---- * 2.7.9 2005-08-15 PRL Added complete support for runtime selection of pixel format and rectangle/power-of-2 textures. * 2.8.0 2006-04-04 PRL Move pixel format constants into toolkit global namespace (in config.h). + * 2.8.1 2006-04-06 PRL Move arglDrawMode, arglTexmapMode, arglTexRectangle out of global variables. * */ *************** *** 176,237 **** // ============================================================================ - // It'd be nicer if these were wrapped in accessor functions. - - /*! - @var arglDrawMode - @abstract Determines display method by which arglDispImage() transfers pixels. - @discussion - The value of this variable determines the method by which - arglDispImage transfers pixels of an image to the display. Setting this - variable to a value of AR_DRAW_BY_GL_DRAW_PIXELS specifies the use of OpenGL - DrawPixels to do the transfer. Setting this variable to a value of - AR_DRAW_BY_TEXTURE_MAPPING specifies the use of OpenGL TexImage2D to do the - transfer. The DrawPixels method is guaranteed to be available on all - implementations, but arglDispImage does not correct the image - for camera lens distortion under this method. In contrast, TexImage2D is only - available on some implementations, but allows arglDispImage() to apply a correction - for camera lens distortion, and additionally offers greater potential for - accelerated drawing on some implementations. - - The initial value is defined to the value of the symbolic constant DEFAULT_DRAW_MODE - (defined in <AR/config.h>). - @availability First appeared in ARToolKit 2.68. - */ - extern int arglDrawMode; - - /*! - @var arglTexmapMode - @abstract Determines use of full or half-resolution TexImage2D pixel-transfer in arglDispImage(). - @discussion - When arglDrawMode is set to AR_DRAW_BY_TEXTURE_MAPPING, the value of this variable - determines whether full or half-resolution data is transferred to the - texture. A value of AR_DRAW_TEXTURE_FULL_IMAGE uses all available pixels in the - source image data. A value of AR_DRAW_TEXTURE_HALF_IMAGE discards every second row - in the source image data, defining a half-height texture which is then drawn stretched - vertically to double its height. - - The latter method is well-suited to drawing interlaced images, as would be obtained - from DV camera sources in interlaced mode or composite video sources. - @availability First appeared in ARToolKit 2.68. - */ - extern int arglTexmapMode; - - /*! - @var arglTexRectangle - @abstract Determines use of rectangular TexImage2D pixel-transfer in arglDispImage(). - @discussion - On implementations which support the OpenGL extension for rectangular textures (of - non power-of-two size), and when arglDrawMode is set to AR_DRAW_BY_TEXTURE_MAPPING, - the value of this variable determines whether rectangular textures or ordinary - (power-of-two) textures are used by arglDispImage(). A value of TRUE specifies the - use of rectangluar textures. A value of FALSE specifies the use of ordinary textures. - - If the OpenGL driver available at runtime does not support for rectangular textures, - changing the value of this variable to TRUE will result calls to arglDispImage - performing no drawing. - @availability First appeared in ARToolKit 2.68. - */ - extern int arglTexRectangle; - #if defined(__APPLE__) && defined(APPLE_TEXTURE_FAST_TRANSFER) extern int arglAppleClientStorage; --- 177,180 ---- *************** *** 239,247 **** extern GLuint arglAppleTextureRangeStorageHint; #endif // __APPLE__ && APPLE_TEXTURE_FAST_TRANSFER ! // ============================================================================ // Public functions. // ============================================================================ ! /*! @function arglSetupForCurrentContext --- 182,190 ---- extern GLuint arglAppleTextureRangeStorageHint; #endif // __APPLE__ && APPLE_TEXTURE_FAST_TRANSFER ! // ============================================================================ // Public functions. // ============================================================================ ! /*! @function arglSetupForCurrentContext *************** *** 459,463 **** context, as returned by arglSetupForCurrentContext() for this context. @param format A symbolic constant for the pixel format being set. See ! @link ARGL_PIX_FORMAT ARGL_PIX_FORMAT @/link for a list of all possible formats. @result TRUE if the pixel format value was set, FALSE if an error occurred. @availability First appeared in ARToolKit 2.71. --- 402,406 ---- context, as returned by arglSetupForCurrentContext() for this context. @param format A symbolic constant for the pixel format being set. See ! @link AR_PIXEL_FORMAT AR_PIXEL_FORMAT @/link for a list of all possible formats. @result TRUE if the pixel format value was set, FALSE if an error occurred. @availability First appeared in ARToolKit 2.71. *************** *** 474,478 **** context, as returned by arglSetupForCurrentContext() for this context. @param format A symbolic constant for the pixel format in use. See ! @link ARGL_PIX_FORMAT ARGL_PIX_FORMAT @/link for a list of all possible formats. @param size The number of bytes of memory occupied per pixel, for the given format. @result TRUE if the pixel format and size values were retreived, FALSE if an error occurred. --- 417,421 ---- context, as returned by arglSetupForCurrentContext() for this context. @param format A symbolic constant for the pixel format in use. See ! @link AR_PIXEL_FORMAT AR_PIXEL_FORMAT @/link for a list of all possible formats. @param size The number of bytes of memory occupied per pixel, for the given format. @result TRUE if the pixel format and size values were retreived, FALSE if an error occurred. *************** *** 481,484 **** --- 424,487 ---- int arglPixelFormatGet(ARGL_CONTEXT_SETTINGS_REF contextSettings, AR_PIXEL_FORMAT *format, int *size); + /*! + @function + @abstract Set method by which arglDispImage() transfers pixels. + @discussion + The value of this setting determines the method by which + arglDispImage transfers pixels of an image to the display. Setting this + variable to a value of AR_DRAW_BY_GL_DRAW_PIXELS specifies the use of OpenGL + DrawPixels to do the transfer. Setting this variable to a value of + AR_DRAW_BY_TEXTURE_MAPPING specifies the use of OpenGL TexImage2D to do the + transfer. The DrawPixels method is guaranteed to be available on all + implementations, but arglDispImage does not correct the image + for camera lens distortion under this method. In contrast, TexImage2D is only + available on some implementations, but allows arglDispImage() to apply a correction + for camera lens distortion, and additionally offers greater potential for + accelerated drawing on some implementations. + + The initial value is AR_DRAW_BY_TEXTURE_MAPPING. + @availability First appeared in ARToolKit 2.68. + */ + void arglDrawModeSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int mode); + int arglDrawModeGet(ARGL_CONTEXT_SETTINGS_REF contextSettings); + + /*! + @function + @abstract Determines use of full or half-resolution TexImage2D pixel-transfer in arglDispImage(). + @discussion + When arglDrawModeSet(AR_DRAW_BY_TEXTURE_MAPPING) has been called, the value of this setting + determines whether full or half-resolution data is transferred to the + texture. A value of AR_DRAW_TEXTURE_FULL_IMAGE uses all available pixels in the + source image data. A value of AR_DRAW_TEXTURE_HALF_IMAGE discards every second row + in the source image data, defining a half-height texture which is then drawn stretched + vertically to double its height. + + The latter method is well-suited to drawing interlaced images, as would be obtained + from DV camera sources in interlaced mode or composite video sources. + + The initial value is AR_DRAW_TEXTURE_FULL_IMAGE. + @availability First appeared in ARToolKit 2.68. + */ + void arglTexmapModeSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int mode); + int arglTexmapModeGet(ARGL_CONTEXT_SETTINGS_REF contextSettings); + + /*! + @function + @abstract Determines use of rectangular TexImage2D pixel-transfer in arglDispImage(). + @discussion + On implementations which support the OpenGL extension for rectangular textures (of + non power-of-two size), and when arglDrawMode is set to AR_DRAW_BY_TEXTURE_MAPPING, + the value of this variable determines whether rectangular textures or ordinary + (power-of-two) textures are used by arglDispImage(). A value of TRUE specifies the + use of rectangluar textures. A value of FALSE specifies the use of ordinary textures. + + If the OpenGL driver available at runtime does not support for rectangular textures, + changing the value of this variable to TRUE will result calls to arglDispImage + performing no drawing. + @availability First appeared in ARToolKit 2.68. + */ + void arglTexRectangleSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int state); + int arglTexRectangleGet(ARGL_CONTEXT_SETTINGS_REF contextSettings); + #ifdef __cplusplus } |
|
From: Philip L. <phi...@us...> - 2006-04-06 05:33:27
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3902 Modified Files: simpleVRML.c Log Message: Moved some gsub_lite globals into state structure. Index: simpleVRML.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** simpleVRML.c 22 Sep 2005 00:46:49 -0000 1.7 --- simpleVRML.c 6 Apr 2006 05:33:21 -0000 1.8 *************** *** 164,170 **** } ! if( arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS ) { fprintf(stderr, "DrawMode (C) : GL_DRAW_PIXELS\n"); ! } else if( arglTexmapMode == AR_DRAW_TEXTURE_FULL_IMAGE ) { fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (FULL RESOLUTION)\n"); } else { --- 164,170 ---- } ! if (arglDrawModeGet(gArglSettings) == AR_DRAW_BY_GL_DRAW_PIXELS) { fprintf(stderr, "DrawMode (C) : GL_DRAW_PIXELS\n"); ! } else if (arglTexmapModeGet(gArglSettings) == AR_DRAW_TEXTURE_FULL_IMAGE) { fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (FULL RESOLUTION)\n"); } else { *************** *** 199,202 **** --- 199,203 ---- static void Keyboard(unsigned char key, int x, int y) { + int mode; switch (key) { case 0x1B: // Quit. *************** *** 207,217 **** case 'C': case 'c': ! if( arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS ) { ! arglDrawMode = AR_DRAW_BY_TEXTURE_MAPPING; ! arglTexmapMode = AR_DRAW_TEXTURE_FULL_IMAGE; ! } else if( arglTexmapMode == AR_DRAW_TEXTURE_FULL_IMAGE ) { ! arglTexmapMode = AR_DRAW_TEXTURE_HALF_IMAGE; } else { ! arglDrawMode = AR_DRAW_BY_GL_DRAW_PIXELS; } fprintf(stderr, "*** Camera - %f (frame/sec)\n", (double)gCallCountMarkerDetect/arUtilTimer()); --- 208,219 ---- case 'C': case 'c': ! mode = arglDrawModeGet(gArglSettings); ! if (mode == AR_DRAW_BY_GL_DRAW_PIXELS) { ! arglDrawModeSet(gArglSettings, AR_DRAW_BY_TEXTURE_MAPPING); ! arglTexmapModeSet(gArglSettings, AR_DRAW_TEXTURE_FULL_IMAGE); } else { ! mode = arglTexmapModeGet(gArglSettings); ! if (mode == AR_DRAW_TEXTURE_FULL_IMAGE) arglTexmapModeSet(gArglSettings, AR_DRAW_TEXTURE_HALF_IMAGE); ! else arglDrawModeSet(gArglSettings, AR_DRAW_BY_GL_DRAW_PIXELS); } fprintf(stderr, "*** Camera - %f (frame/sec)\n", (double)gCallCountMarkerDetect/arUtilTimer()); *************** *** 220,230 **** demoARDebugReportMode(); break; - #ifdef AR_OPENGL_TEXTURE_RECTANGLE - case 'R': - case 'r': - arglTexRectangle = !arglTexRectangle; - fprintf(stderr, "Toggled arglTexRectangle to %d.\n", arglTexRectangle); - break; - #endif // AR_OPENGL_TEXTURE_RECTANGLE case '?': case '/': --- 222,225 ---- *************** *** 232,238 **** printf(" q or [esc] Quit demo.\n"); printf(" c Change arglDrawMode and arglTexmapMode.\n"); - #ifdef AR_OPENGL_TEXTURE_RECTANGLE - printf(" r Toggle arglTexRectangle.\n"); - #endif // AR_OPENGL_TEXTURE_RECTANGLE printf(" ? or / Show this help.\n"); printf("\nAdditionally, the ARVideo library supplied the following help text:\n"); --- 227,230 ---- |
|
From: Philip L. <phi...@us...> - 2006-04-06 05:32:42
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3257 Modified Files: project.pbxproj Log Message: Correct flaw in doxygen script. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** project.pbxproj 5 Apr 2006 05:46:41 -0000 1.7 --- project.pbxproj 6 Apr 2006 05:32:24 -0000 1.8 *************** *** 4577,4581 **** runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/csh; ! shellScript = "#!/bin/csh\nif (-X doxygen) then\ncd \"${SRCROOT}/doc\"\nrm -f *.html doxygen.css\ndoxygen doxygen_config.dox\nsed -E -i \".bak\" 's/gsub__lite_8h\\.html(#[^\\\"]*)?/gsub_lite\\/index\\.html/' *.html\nrm -f *.bak gsub__lite_8h.html\nrm -f doxygen.png\nendif\n"; }; /* End PBXShellScriptBuildPhase section */ --- 4577,4581 ---- runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/csh; ! shellScript = "#!/bin/csh\nif (-X doxygen) then\ncd \"${SRCROOT}/doc\"\nmv header.html header.html.tmp\nmv footer.html footer.html.tmp\nrm -f *.html doxygen.css\ndoxygen doxygen_config.dox\nsed -E -i \".bak\" 's/gsub__lite_8h\\.html(#[^\\\"]*)?/gsub_lite\\/index\\.html/' *.html\nrm -f *.bak gsub__lite_8h.html\nrm -f doxygen.png\nendif\n"; }; /* End PBXShellScriptBuildPhase section */ |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:48:57
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32366 Modified Files: ChangeLog.txt Log Message: Move pixel format from gsub_lite into global namespace. Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ChangeLog.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ChangeLog.txt 12 Oct 2005 00:27:43 -0000 1.5 --- ChangeLog.txt 5 Apr 2006 05:48:54 -0000 1.6 *************** *** 3,7 **** ! Changes in this release (2005-10-11). ------------------------------------- - Fixed line endings in MS Visual Studio 6 workspace (.dsw) file. --- 3,14 ---- ! Changes in this release (2006-??-??). ! ------------------------------------- ! - Removed XCode project file for versions prior to XCode 2.1. ! - Fixed line endings in MS Visual Studio 6 project files calib_distortion.dsp and calib_camera2.dsp. ! - Cleaned up pixel format specification in config.h, borrowing code from gsub_lite. ! ! ! Changes in version 2.71.2 (2005-10-11). ------------------------------------- - Fixed line endings in MS Visual Studio 6 workspace (.dsw) file. |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:48:52
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32267 Modified Files: config.h.in ar.h gsub_lite.h Log Message: Move pixel format from gsub_lite into global namespace. Index: ar.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/ar.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ar.h 23 Aug 2005 18:20:40 -0000 1.6 --- ar.h 5 Apr 2006 05:48:43 -0000 1.7 *************** *** 55,62 **** * \brief allocation macro function * ! * allocate S element of type T. * \param V returned allocated area pointer * \param T type of element ! * \param S number of element */ #define arMalloc(V,T,S) \ --- 55,62 ---- * \brief allocation macro function * ! * allocate S elements of type T. * \param V returned allocated area pointer * \param T type of element ! * \param S number of elements */ #define arMalloc(V,T,S) \ *************** *** 72,75 **** --- 72,125 ---- typedef unsigned int ARUint32; + /** \typedef AR_PIXEL_FORMAT + \brief ARToolKit pixel-format specifiers. + + ARToolKit functions can accept pixel data in a variety of formats. + This enumerations provides a set of constants you can use to request + data in a particular pixel format from an ARToolKit function that + returns data to you, or to specify that data you are providing to an + ARToolKit function is in a particular pixel format. + + \var AR_PIXEL_FORMAT_RGB + Each pixel is represented by 24 bits. Eight bits per each Red, Green, + and Blue component. This is the native 24 bit format for the Mac platform. + \var AR_PIXEL_FORMAT_BGR + Each pixel is represented by 24 bits. Eight bits per each Blue, Red, and + Green component. This is the native 24 bit format for the Win32 platform. + \var AR_PIXEL_FORMAT_RGBA + Each pixel is represented by 32 bits. Eight bits per each Red, Green, + Blue, and Alpha component. + \var AR_PIXEL_FORMAT_BGRA + Each pixel is represented by 32 bits. Eight bits per each Blue, Green, + Red, and Alpha component. This is the native 32 bit format for the Win32 + platform. + \var AR_PIXEL_FORMAT_ABGR + Each pixel is represented by 32 bits. Eight bits per each Alpha, Blue, + Green, and Red component. This is the native 32 bit format for the SGI + platform. + \var AR_PIXEL_FORMAT_ARGB + Each pixel is represented by 32 bits. Eight bits per each Alpha, Red, + Green, and Blue component. This is the native 32 bit format for the Mac + platform. + \var AR_PIXEL_FORMAT_2vuy + 8-bit 4:2:2 Component Y'CbCr format. Each 16 bit pixel is represented + by an unsigned eight bit luminance component and two unsigned eight bit + chroma components. Each pair of pixels shares a common set of chroma + values. The components are ordered in memory; Cb, Y0, Cr, Y1. The + luminance components have a range of [16, 235], while the chroma value + has a range of [16, 240]. This is consistent with the CCIR601 spec. + This format is fairly prevalent on both Mac and Win32 platforms. + '2vuy' is the Apple QuickTime four-character code for this pixel format. + The equivalent Microsoft fourCC is 'UYVY'. + \var AR_PIXEL_FORMAT_yuvs + 8-bit 4:2:2 Component Y'CbCr format. Identical to the AR_PIXEL_FORMAT_2vuy except + each 16 bit word has been byte swapped. This results in a component + ordering of; Y0, Cb, Y1, Cr. + This is most prevalent yuv 4:2:2 format on both Mac and Win32 platforms. + 'yuvs' is the Apple QuickTime four-character code for this pixel format. + The equivalent Microsoft fourCC is 'YUY2'. + */ + typedef int AR_PIXEL_FORMAT; + /** \struct ARMarkerInfo * \brief main structure for detected marker. Index: config.h.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.h.in 2 Dec 2004 07:27:17 -0000 1.3 --- config.h.in 5 Apr 2006 05:48:43 -0000 1.4 *************** *** 2,5 **** --- 2,16 ---- #define AR_CONFIG_H + #define AR_PIXEL_FORMAT_RGB 1 + #define AR_PIXEL_FORMAT_BGR 2 + #define AR_PIXEL_FORMAT_RGBA 3 + #define AR_PIXEL_FORMAT_BGRA 4 + #define AR_PIXEL_FORMAT_ABGR 5 + #define AR_PIXEL_FORMAT_ARGB 7 + #define AR_PIXEL_FORMAT_2vuy 8 + #define AR_PIXEL_FORMAT_UYVY AR_PIXEL_FORMAT_2vuy + #define AR_PIXEL_FORMAT_yuvs 9 + #define AR_PIXEL_FORMAT_YUY2 AR_PIXEL_FORMAT_yuvs + /*------------------------------------------------------------*/ /* */ *************** *** 17,34 **** # ifdef AR_INPUT_V4L # ifdef USE_EYETOY ! # define AR_PIX_FORMAT_RGB # else ! # define AR_PIX_FORMAT_BGR # endif - # undef AR_PIX_FORMAT_BGRA # endif # ifdef AR_INPUT_DV ! # define AR_PIX_FORMAT_RGB ! # undef AR_PIX_FORMAT_BGRA # endif # ifdef AR_INPUT_1394CAM ! # define AR_PIX_FORMAT_RGB # endif --- 28,43 ---- # ifdef AR_INPUT_V4L # ifdef USE_EYETOY ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_RGB # else ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_BGR # endif # endif # ifdef AR_INPUT_DV ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_RGB # endif # ifdef AR_INPUT_1394CAM ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_RGB # endif *************** *** 44,48 **** # define AR_BIG_ENDIAN # undef AR_LITTLE_ENDIAN ! # define AR_PIX_FORMAT_ABGR #endif --- 53,57 ---- # define AR_BIG_ENDIAN # undef AR_LITTLE_ENDIAN ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_ABGR #endif *************** *** 53,57 **** # undef AR_BIG_ENDIAN # define AR_LITTLE_ENDIAN ! # define AR_PIX_FORMAT_BGRA #endif --- 62,66 ---- # undef AR_BIG_ENDIAN # define AR_LITTLE_ENDIAN ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_BGRA #endif *************** *** 60,66 **** /*------------------------------------------------------------*/ #ifdef __APPLE__ ! # define AR_BIG_ENDIAN ! # undef AR_LITTLE_ENDIAN ! # define AR_PIX_FORMAT_2vuy #endif --- 69,80 ---- /*------------------------------------------------------------*/ #ifdef __APPLE__ ! # if defined(__BIG_ENDIAN__) // Check architecture endianess using gcc's macro. ! # define AR_BIG_ENDIAN // Most Significant Byte has greatest address in memory (ppc). ! # undef AR_LITTLE_ENDIAN ! # elif defined (__LITTLE_ENDIAN__) ! # undef AR_BIG_ENDIAN // Least significant Byte has least address in memory (i386). ! # define AR_LITTLE_ENDIAN ! # endif ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_2vuy #endif *************** *** 167,178 **** ! #if defined(AR_PIX_FORMAT_ABGR) || defined(AR_PIX_FORMAT_BGRA) || defined(AR_PIX_FORMAT_RGBA) || defined(AR_PIX_FORMAT_ARGB) ! # define AR_PIX_SIZE 4 ! #elif defined(AR_PIX_FORMAT_BGR) || defined(AR_PIX_FORMAT_RGB) ! # define AR_PIX_SIZE 3 ! #elif defined(AR_PIX_FORMAT_2vuy) || defined(AR_PIX_FORMAT_yuvs) ! # define AR_PIX_SIZE 2 #else ! # error Unknown pixel format defined in config.h. #endif --- 181,192 ---- ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) ! # define AR_PIX_SIZE_DEFAULT 4 ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) ! # define AR_PIX_SIZE_DEFAULT 3 ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) ! # define AR_PIX_SIZE_DEFAULT 2 #else ! # error Unknown default pixel format defined in config.h. #endif Index: gsub_lite.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/gsub_lite.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gsub_lite.h 21 Sep 2005 23:49:26 -0000 1.6 --- gsub_lite.h 5 Apr 2006 05:48:43 -0000 1.7 *************** *** 18,21 **** --- 18,22 ---- * 2.7.8 2005-07-29 PRL Added distortion compensation enabling/disabling. * 2.7.9 2005-08-15 PRL Added complete support for runtime selection of pixel format and rectangle/power-of-2 textures. + * 2.8.0 2006-04-04 PRL Move pixel format constants into toolkit global namespace (in config.h). * */ *************** *** 171,235 **** typedef struct _ARGL_CONTEXT_SETTINGS *ARGL_CONTEXT_SETTINGS_REF; - /*! - @typedef ARGL_PIX_FORMAT - @abstract ARToolKit pixel-format specifiers. - @discussion - ARToolKit functions can accept pixel data in a variety of formats. - This enumerations provides a set of constants you can use to request - data in a particular pixel format from an ARToolKit function that - returns data to you, or to specify that data you are providing to an - ARToolKit function is in a particular pixel format. - @constant ARGL_PIX_FORMAT_RGBA - Each pixel is represented by 32 bits. Eight bits per each Red, Green, - Blue, and Alpha component. - @constant ARGL_PIX_FORMAT_ABGR - Each pixel is represented by 32 bits. Eight bits per each Alpha, Blue, - Green, and Red component. This is the native 32 bit format for the SGI - platform. - @constant ARGL_PIX_FORMAT_BGRA - Each pixel is represented by 32 bits. Eight bits per each Blue, Green, - Red, and Alpha component. This is the native 32 bit format for the Win32 - platform. - @constant ARGL_PIX_FORMAT_ARGB - Each pixel is represented by 32 bits. Eight bits per each Alpha, Red, - Green, and Blue component. This is the native 32 bit format for the Mac - platform. - @constant ARGL_PIX_FORMAT_RGB - Each pixel is represented by 24 bits. Eight bits per each Red, Green, - and Blue component. This is the native 24 bit format for the Mac platform. - @constant ARGL_PIX_FORMAT_BGR - Each pixel is represented by 24 bits. Eight bits per each Blue, Red, and - Green component. This is the native 24 bit format for the Win32 platform. - @constant ARGL_PIX_FORMAT_2vuy - 8-bit 4:2:2 Component Y'CbCr format. Each 16 bit pixel is represented - by an unsigned eight bit luminance component and two unsigned eight bit - chroma components. Each pair of pixels shares a common set of chroma - values. The components are ordered in memory; Cb, Y0, Cr, Y1. The - luminance components have a range of [16, 235], while the chroma value - has a range of [16, 240]. This is consistent with the CCIR601 spec. - This format is fairly prevalent on both Mac and Win32 platforms. - '2vuy' is the Apple QuickTime four-character code for this pixel format. - The equivalent Microsoft fourCC is 'UYVY'. - @constant ARGL_PIX_FORMAT_yuvs - 8-bit 4:2:2 Component Y'CbCr format. Identical to the ARGL_PIX_FORMAT_2vuy except - each 16 bit word has been byte swapped. This results in a component - ordering of; Y0, Cb, Y1, Cr. - This is most prevalent yuv 4:2:2 format on both Mac and Win32 platforms. - 'yuvs' is the Apple QuickTime four-character code for this pixel format. - The equivalent Microsoft fourCC is 'YUY2'. - */ - typedef enum { - ARGL_PIX_FORMAT_RGBA = 1, - ARGL_PIX_FORMAT_ABGR = 2, - ARGL_PIX_FORMAT_BGRA = 3, - ARGL_PIX_FORMAT_ARGB = 4, - ARGL_PIX_FORMAT_RGB = 5, - ARGL_PIX_FORMAT_BGR = 6, - ARGL_PIX_FORMAT_2vuy = 7, - ARGL_PIX_FORMAT_UYVY = ARGL_PIX_FORMAT_2vuy, - ARGL_PIX_FORMAT_yuvs = 8, - ARGL_PIX_FORMAT_YUY2 = ARGL_PIX_FORMAT_yuvs, - } ARGL_PIX_FORMAT; - // ============================================================================ // Public globals. --- 172,175 ---- *************** *** 512,517 **** gsub_lite the format the pixels being passed to arglDispImage*() functions are in. This setting applies only to the context passed in parameter ! contextSettings. The default format is determined by which of the possible ! AR_PIXEL_FORMAT_xxxx symbols was defined at the time the library was built. Usually, image data is passed in directly from images generated by ARVideo, and so you should ensure that ARVideo is generating pixels of the same format. --- 452,457 ---- gsub_lite the format the pixels being passed to arglDispImage*() functions are in. This setting applies only to the context passed in parameter ! contextSettings. The default format is determined by ! the value of AR_PIXEL_FORMAT_DEFAULT at the time the library was built. Usually, image data is passed in directly from images generated by ARVideo, and so you should ensure that ARVideo is generating pixels of the same format. *************** *** 523,527 **** @availability First appeared in ARToolKit 2.71. */ ! int arglPixelFormatSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, ARGL_PIX_FORMAT format); /*! --- 463,467 ---- @availability First appeared in ARToolKit 2.71. */ ! int arglPixelFormatSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, AR_PIXEL_FORMAT format); /*! *************** *** 530,535 **** @discussion This function enquires as to the current format of pixel data being expected by the arglDispImage*() functions. The default format is determined by ! which of the possible AR_PIXEL_FORMAT_xxxx symbols was defined at the time the ! library was built. @param contextSettings A reference to ARGL's settings for the current OpenGL context, as returned by arglSetupForCurrentContext() for this context. --- 470,474 ---- @discussion This function enquires as to the current format of pixel data being expected by the arglDispImage*() functions. The default format is determined by ! the value of AR_PIXEL_FORMAT_DEFAULT at the time the library was built. @param contextSettings A reference to ARGL's settings for the current OpenGL context, as returned by arglSetupForCurrentContext() for this context. *************** *** 540,544 **** @availability First appeared in ARToolKit 2.71. */ ! int arglPixelFormatGet(ARGL_CONTEXT_SETTINGS_REF contextSettings, ARGL_PIX_FORMAT *format, int *size); #ifdef __cplusplus --- 479,483 ---- @availability First appeared in ARToolKit 2.71. */ ! int arglPixelFormatGet(ARGL_CONTEXT_SETTINGS_REF contextSettings, AR_PIXEL_FORMAT *format, int *size); #ifdef __cplusplus |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:48:40
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32170 Modified Files: main.c Log Message: Move pixel format from gsub_lite into global namespace. Index: main.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** main.c 22 Sep 2005 00:44:37 -0000 1.8 --- main.c 5 Apr 2006 05:48:33 -0000 1.9 *************** *** 227,232 **** } arglDistortionCompensationSet(gPatt.arglSettings[gPatt.loop_num-1], FALSE); ! arMalloc((gPatt.savedImage)[gPatt.loop_num-1], unsigned char, gXsize*gYsize*AR_PIX_SIZE); ! memcpy((gPatt.savedImage)[gPatt.loop_num-1], image, gXsize*gYsize*AR_PIX_SIZE); printf("Grabbed image %d.\n", gPatt.loop_num); arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num); --- 227,232 ---- } arglDistortionCompensationSet(gPatt.arglSettings[gPatt.loop_num-1], FALSE); ! arMalloc((gPatt.savedImage)[gPatt.loop_num-1], unsigned char, gXsize*gYsize*AR_PIX_SIZE_DEFAULT); ! memcpy((gPatt.savedImage)[gPatt.loop_num-1], image, gXsize*gYsize*AR_PIX_SIZE_DEFAULT); printf("Grabbed image %d.\n", gPatt.loop_num); arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num); *************** *** 412,437 **** p1 = gClipImage; for (j = ssy; j <= eey; j++) { ! p = &(gPatt.savedImage[gPatt.loop_num-1][(j*gXsize+ssx)*AR_PIX_SIZE]); for (i = ssx; i <= eex; i++) { ! #if defined(AR_PIX_FORMAT_BGRA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_ABGR) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_ARGB) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_BGR) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_RGBA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_RGB) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_2vuy) *p1 = ((255 - *(p+1)) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_yuvs) *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255); #else ! # error Unknown pixel format defined in config.h #endif ! p += AR_PIX_SIZE; p1++; } --- 412,437 ---- p1 = gClipImage; for (j = ssy; j <= eey; j++) { ! p = &(gPatt.savedImage[gPatt.loop_num-1][(j*gXsize+ssx)*AR_PIX_SIZE_DEFAULT]); for (i = ssx; i <= eex; i++) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) *p1 = ((255 - *(p+1)) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255); #else ! # error Unknown default pixel format defined in config.h #endif ! p += AR_PIX_SIZE_DEFAULT; p1++; } |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:48:32
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32087 Modified Files: video.c Log Message: Move pixel format from gsub_lite into global namespace. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam/video.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** video.c 13 Mar 2005 23:32:25 -0000 1.3 --- video.c 5 Apr 2006 05:48:24 -0000 1.4 *************** *** 457,461 **** } ! arMalloc( vid->image, ARUint8, (vid->camera.frame_width * vid->camera.frame_height * AR_PIX_SIZE) ); return vid; --- 457,461 ---- } ! arMalloc( vid->image, ARUint8, (vid->camera.frame_width * vid->camera.frame_height * AR_PIX_SIZE_DEFAULT) ); return vid; |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:48:20
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31987 Modified Files: video.c Log Message: Move pixel format from gsub_lite into global namespace. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L/video.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** video.c 27 Jul 2005 21:21:24 -0000 1.3 --- video.c 5 Apr 2006 05:48:13 -0000 1.4 *************** *** 159,165 **** vid->width = DEFAULT_VIDEO_WIDTH; vid->height = DEFAULT_VIDEO_HEIGHT; ! #if defined(AR_PIX_FORMAT_BGRA) vid->palette = VIDEO_PALETTE_RGB32; /* palette format */ ! #elif defined(AR_PIX_FORMAT_BGR) || defined(AR_PIX_FORMAT_RGB) vid->palette = VIDEO_PALETTE_RGB24; /* palette format */ #endif --- 159,165 ---- vid->width = DEFAULT_VIDEO_WIDTH; vid->height = DEFAULT_VIDEO_HEIGHT; ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) vid->palette = VIDEO_PALETTE_RGB32; /* palette format */ ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) vid->palette = VIDEO_PALETTE_RGB24; /* palette format */ #endif *************** *** 212,218 **** else if( strncmp( a, "-palette=", 9 ) == 0 ) { if( strncmp( &a[9], "RGB", 3) == 0 ) { ! #if defined(AR_PIX_FORMAT_BGRA) vid->palette = VIDEO_PALETTE_RGB32; /* palette format */ ! #elif defined(AR_PIX_FORMAT_BGR)|| defined(AR_PIX_FORMAT_RGB) vid->palette = VIDEO_PALETTE_RGB24; /* palette format */ #endif --- 212,218 ---- else if( strncmp( a, "-palette=", 9 ) == 0 ) { if( strncmp( &a[9], "RGB", 3) == 0 ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) vid->palette = VIDEO_PALETTE_RGB32; /* palette format */ ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR)|| (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) vid->palette = VIDEO_PALETTE_RGB24; /* palette format */ #endif |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:48:13
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31678 Modified Files: gsub_lite.c gsub.c Log Message: Move pixel format from gsub_lite into global namespace. Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gsub_lite.c 22 Sep 2005 19:44:36 -0000 1.11 --- gsub_lite.c 5 Apr 2006 05:48:03 -0000 1.12 *************** *** 18,21 **** --- 18,22 ---- * 2.7.8 2005-07-29 PRL Added distortion compensation enabling/disabling. * 2.7.9 2005-08-15 PRL Added complete support for runtime selection of pixel format and rectangle/power-of-2 textures. + * 2.8.0 2006-04-04 PRL Move pixel format constants into toolkit global namespace (in config.h). * */ *************** *** 685,707 **** contextSettings = (ARGL_CONTEXT_SETTINGS_REF)calloc(1, sizeof(ARGL_CONTEXT_SETTINGS)); // Use default pixel format handed to us by <AR/config.h>. ! #if defined(AR_PIX_FORMAT_RGBA) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_RGBA); ! #elif defined(AR_PIX_FORMAT_ABGR) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_ABGR); ! #elif defined(AR_PIX_FORMAT_BGRA) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_BGRA); ! #elif defined(AR_PIX_FORMAT_ARGB) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_ARGB); ! #elif defined(AR_PIX_FORMAT_RGB) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_RGB); ! #elif defined(AR_PIX_FORMAT_BGR) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_BGR); ! #elif defined(AR_PIX_FORMAT_2vuy) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_2vuy); ! #elif defined(AR_PIX_FORMAT_yuvs) ! arglPixelFormatSet(contextSettings, ARGL_PIX_FORMAT_yuvs); ! #else ! # error Unknown pixel format defined in config.h. ! #endif return (contextSettings); } --- 686,694 ---- contextSettings = (ARGL_CONTEXT_SETTINGS_REF)calloc(1, sizeof(ARGL_CONTEXT_SETTINGS)); // Use default pixel format handed to us by <AR/config.h>. ! fprintf(stderr, "pix fmt is %d \n", AR_PIXEL_FORMAT_DEFAULT); ! if (!arglPixelFormatSet(contextSettings, AR_PIXEL_FORMAT_DEFAULT)) { ! fprintf(stderr, "Unknown default pixel format defined in config.h.\n"); ! return (NULL); ! } return (contextSettings); } *************** *** 838,846 **** } ! int arglPixelFormatSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, ARGL_PIX_FORMAT format) { if (!contextSettings) return (FALSE); switch (format) { ! case ARGL_PIX_FORMAT_RGBA: contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_RGBA; --- 825,833 ---- } ! int arglPixelFormatSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, AR_PIXEL_FORMAT format) { if (!contextSettings) return (FALSE); switch (format) { ! case AR_PIXEL_FORMAT_RGBA: contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_RGBA; *************** *** 848,852 **** contextSettings->pixSize = 4; break; ! case ARGL_PIX_FORMAT_ABGR: // SGI. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_ABGR_EXT; --- 835,839 ---- contextSettings->pixSize = 4; break; ! case AR_PIXEL_FORMAT_ABGR: // SGI. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_ABGR_EXT; *************** *** 854,858 **** contextSettings->pixSize = 4; break; ! case ARGL_PIX_FORMAT_BGRA: // Windows. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_BGRA; --- 841,845 ---- contextSettings->pixSize = 4; break; ! case AR_PIXEL_FORMAT_BGRA: // Windows. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_BGRA; *************** *** 860,864 **** contextSettings->pixSize = 4; break; ! case ARGL_PIX_FORMAT_ARGB: // Mac. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_BGRA; --- 847,851 ---- contextSettings->pixSize = 4; break; ! case AR_PIXEL_FORMAT_ARGB: // Mac. contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_BGRA; *************** *** 866,870 **** contextSettings->pixSize = 4; break; ! case ARGL_PIX_FORMAT_RGB: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_RGB; --- 853,857 ---- contextSettings->pixSize = 4; break; ! case AR_PIXEL_FORMAT_RGB: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_RGB; *************** *** 872,876 **** contextSettings->pixSize = 3; break; ! case ARGL_PIX_FORMAT_BGR: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_BGR; --- 859,863 ---- contextSettings->pixSize = 3; break; ! case AR_PIXEL_FORMAT_BGR: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_BGR; *************** *** 878,882 **** contextSettings->pixSize = 3; break; ! case ARGL_PIX_FORMAT_2vuy: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_YCBCR_422_APPLE; --- 865,869 ---- contextSettings->pixSize = 3; break; ! case AR_PIXEL_FORMAT_2vuy: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_YCBCR_422_APPLE; *************** *** 884,888 **** contextSettings->pixSize = 2; break; ! case ARGL_PIX_FORMAT_yuvs: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_YCBCR_422_APPLE; --- 871,875 ---- contextSettings->pixSize = 2; break; ! case AR_PIXEL_FORMAT_yuvs: contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_YCBCR_422_APPLE; *************** *** 898,929 **** } ! int arglPixelFormatGet(ARGL_CONTEXT_SETTINGS_REF contextSettings, ARGL_PIX_FORMAT *format, int *size) { if (!contextSettings) return (FALSE); switch (contextSettings->pixFormat) { case GL_RGBA: ! *format = ARGL_PIX_FORMAT_RGBA; *size = 4; break; case GL_ABGR_EXT: ! *format = ARGL_PIX_FORMAT_ABGR; *size = 4; break; case GL_BGRA: ! if (contextSettings->pixType == GL_UNSIGNED_BYTE) *format = ARGL_PIX_FORMAT_BGRA; ! else *format = ARGL_PIX_FORMAT_ARGB; *size = 4; break; case GL_RGB: ! *format = ARGL_PIX_FORMAT_RGB; *size = 3; break; case GL_BGR: ! *format = ARGL_PIX_FORMAT_BGR; *size = 3; break; case GL_YCBCR_422_APPLE: ! if (contextSettings->pixType == GL_UNSIGNED_SHORT_8_8_REV_APPLE) *format = ARGL_PIX_FORMAT_2vuy; ! else *format = ARGL_PIX_FORMAT_yuvs; *size = 2; break; --- 885,916 ---- } ! int arglPixelFormatGet(ARGL_CONTEXT_SETTINGS_REF contextSettings, AR_PIXEL_FORMAT *format, int *size) { if (!contextSettings) return (FALSE); switch (contextSettings->pixFormat) { case GL_RGBA: ! *format = AR_PIXEL_FORMAT_RGBA; *size = 4; break; case GL_ABGR_EXT: ! *format = AR_PIXEL_FORMAT_ABGR; *size = 4; break; case GL_BGRA: ! if (contextSettings->pixType == GL_UNSIGNED_BYTE) *format = AR_PIXEL_FORMAT_BGRA; ! else *format = AR_PIXEL_FORMAT_ARGB; *size = 4; break; case GL_RGB: ! *format = AR_PIXEL_FORMAT_RGB; *size = 3; break; case GL_BGR: ! *format = AR_PIXEL_FORMAT_BGR; *size = 3; break; case GL_YCBCR_422_APPLE: ! if (contextSettings->pixType == GL_UNSIGNED_SHORT_8_8_REV_APPLE) *format = AR_PIXEL_FORMAT_2vuy; ! else *format = AR_PIXEL_FORMAT_yuvs; *size = 2; break; Index: gsub.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gsub.c 20 Jul 2005 22:38:35 -0000 1.3 --- gsub.c 5 Apr 2006 05:48:03 -0000 1.4 *************** *** 419,440 **** glRasterPos3f( sx, sy, -1.0 ); ! #if defined(AR_PIX_FORMAT_ARGB) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glDrawPixels( gImXsize, gImYsize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glDrawPixels( gImXsize, gImYsize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glDrawPixels( gImXsize, gImYsize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glDrawPixels( gImXsize, gImYsize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } --- 419,440 ---- glRasterPos3f( sx, sy, -1.0 ); ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glDrawPixels( gImXsize, gImYsize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glDrawPixels( gImXsize, gImYsize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glDrawPixels( gImXsize, gImYsize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glDrawPixels( gImXsize, gImYsize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } *************** *** 495,537 **** glPixelStorei( GL_UNPACK_ROW_LENGTH, gImXsize*size_adjust_factor ); if( size_adjust_factor == old_size_adjust_factor ) { ! #if defined(AR_PIX_FORMAT_ARGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } else { ! #if defined(AR_PIX_FORMAT_ARGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; --- 495,537 ---- glPixelStorei( GL_UNPACK_ROW_LENGTH, gImXsize*size_adjust_factor ); if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; *************** *** 625,631 **** #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,gImXsize*tex1Ysize*AR_PIX_SIZE); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE); #endif --- 625,631 ---- #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,gImXsize*tex1Ysize*AR_PIX_SIZE_DEFAULT); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE_DEFAULT); #endif *************** *** 661,703 **** if( size_adjust_factor == old_size_adjust_factor ) { ! #if defined(AR_PIX_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } else { ! #if defined(AR_PIX_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; --- 661,703 ---- if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; *************** *** 814,820 **** #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,gImXsize*tex1Ysize*AR_PIX_SIZE); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE); #endif --- 814,820 ---- #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,gImXsize*tex1Ysize*AR_PIX_SIZE_DEFAULT); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE_DEFAULT); #endif *************** *** 850,892 **** if( size_adjust_factor == old_size_adjust_factor ) { ! #if defined(AR_PIX_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } else { ! #if defined(AR_PIX_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } --- 850,892 ---- if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } *************** *** 979,1021 **** if( size_adjust_factor == old_size_adjust_factor ) { ! #if defined(AR_PIX_FORMAT_ARGB) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_ABGR) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_BGRA) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_BGR) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_RGBA) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_RGB) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_2vuy) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_yuvs) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE ); #else ! # error Unknown pixel format defined in config.h #endif } else { ! #if defined(AR_PIX_FORMAT_ARGB) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_ABGR) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_BGR) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_RGBA) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_RGB) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_2vuy) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE ); ! #elif defined(AR_PIX_FORMAT_yuvs) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE ); #else ! # error Unknown pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; --- 979,1021 ---- if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) ! glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #else ! # error Unknown default pixel format defined in config.h #endif } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) ! glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #else ! # error Unknown default pixel format defined in config.h #endif old_size_adjust_factor = size_adjust_factor; *************** *** 1151,1172 **** glRasterPos3f( sx, sy, -1.0 ); ! #if defined(AR_PIX_FORMAT_ARGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } --- 1151,1172 ---- glRasterPos3f( sx, sy, -1.0 ); ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } *************** *** 1203,1209 **** #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,tex2Xsize*tex2Ysize*AR_PIX_SIZE); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE/4); #endif --- 1203,1209 ---- #ifdef _WIN32 if( image == NULL ) { ! arMalloc(image,ARUint8,tex2Xsize*tex2Ysize*AR_PIX_SIZE_DEFAULT); } ! memcpy(image, wimage, gImXsize*gImYsize*AR_PIX_SIZE_DEFAULT/4); #endif *************** *** 1230,1272 **** if( initf == 0 ) { ! #if defined(AR_PIX_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } else { ! #if defined(AR_PIX_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif defined(AR_PIX_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif defined(AR_PIX_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif defined(AR_PIX_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown pixel format defined in config.h #endif } --- 1230,1272 ---- if( initf == 0 ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else ! # error Unknown default pixel format defined in config.h #endif } |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:47:57
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_cparam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31607 Modified Files: calib_cparam.c Log Message: Move pixel format from gsub_lite into global namespace. Index: calib_cparam.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** calib_cparam.c 22 Sep 2005 00:44:41 -0000 1.10 --- calib_cparam.c 5 Apr 2006 05:47:51 -0000 1.11 *************** *** 157,161 **** } arglDistortionCompensationSet(gSaveArglSettings, FALSE); ! arMalloc(gSaveARTImage, unsigned char, gXsize*gYsize*AR_PIX_SIZE); // Register GLUT event-handling callbacks. --- 157,161 ---- } arglDistortionCompensationSet(gSaveArglSettings, FALSE); ! arMalloc(gSaveARTImage, unsigned char, gXsize*gYsize*AR_PIX_SIZE_DEFAULT); // Register GLUT event-handling callbacks. *************** *** 208,212 **** // Allocate space for a save image. ! arMalloc(gSaveARTImage, unsigned char, gXsize * gYsize * AR_PIX_SIZE); param.xsize = gXsize; --- 208,212 ---- // Allocate space for a save image. ! arMalloc(gSaveARTImage, unsigned char, gXsize * gYsize * AR_PIX_SIZE_DEFAULT); param.xsize = gXsize; *************** *** 280,284 **** image = arVideoGetImage(); } while (image == NULL); ! memcpy(gSaveARTImage, image, gXsize*gYsize*AR_PIX_SIZE); printf("Grabbed image.\n"); arVideoCapStop(); --- 280,284 ---- image = arVideoGetImage(); } while (image == NULL); ! memcpy(gSaveARTImage, image, gXsize*gYsize*AR_PIX_SIZE_DEFAULT); printf("Grabbed image.\n"); arVideoCapStop(); |
|
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; } |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:47:38
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31487 Modified Files: calib_dist.c Log Message: Move pixel format from gsub_lite into global namespace. Index: calib_dist.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** calib_dist.c 22 Sep 2005 00:44:45 -0000 1.11 --- calib_dist.c 5 Apr 2006 05:47:34 -0000 1.12 *************** *** 211,216 **** } arglDistortionCompensationSet(gPatt.arglSettings[gPatt.loop_num-1], FALSE); ! arMalloc((gPatt.savedImage)[gPatt.loop_num-1], unsigned char, gXsize*gYsize*AR_PIX_SIZE); ! memcpy((gPatt.savedImage)[gPatt.loop_num-1], image, gXsize*gYsize*AR_PIX_SIZE); printf("Grabbed image %d.\n", gPatt.loop_num); arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num); --- 211,216 ---- } arglDistortionCompensationSet(gPatt.arglSettings[gPatt.loop_num-1], FALSE); ! arMalloc((gPatt.savedImage)[gPatt.loop_num-1], unsigned char, gXsize*gYsize*AR_PIX_SIZE_DEFAULT); ! memcpy((gPatt.savedImage)[gPatt.loop_num-1], image, gXsize*gYsize*AR_PIX_SIZE_DEFAULT); printf("Grabbed image %d.\n", gPatt.loop_num); arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num); *************** *** 385,410 **** p1 = gClipImage; for (j = ssy; j <= eey; j++) { ! p = &(gPatt.savedImage[gPatt.loop_num-1][(j*gXsize+ssx)*AR_PIX_SIZE]); for (i = ssx; i <= eex; i++) { ! #if defined(AR_PIX_FORMAT_BGRA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_ABGR) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_ARGB) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_BGR) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_RGBA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_RGB) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_2vuy) *p1 = ((255 - *(p+1)) < gThresh ? 0 : 255); ! #elif defined(AR_PIX_FORMAT_yuvs) *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255); #else ! # error Unknown pixel format defined in config.h #endif ! p += AR_PIX_SIZE; p1++; } --- 385,410 ---- p1 = gClipImage; for (j = ssy; j <= eey; j++) { ! p = &(gPatt.savedImage[gPatt.loop_num-1][(j*gXsize+ssx)*AR_PIX_SIZE_DEFAULT]); for (i = ssx; i <= eex; i++) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) *p1 = ((255 - *(p+1)) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255); #else ! # error Unknown default pixel format defined in config.h #endif ! p += AR_PIX_SIZE_DEFAULT; p1++; } |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:47:28
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxDV In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31424 Modified Files: video.c Log Message: Move pixel format from gsub_lite into global namespace. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxDV/video.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** video.c 4 Nov 2004 08:51:49 -0000 1.1.1.1 --- video.c 5 Apr 2006 05:47:24 -0000 1.2 *************** *** 24,33 **** static void ar2VideoCapture(AR2VideoParamT *vid); static int ar2VideoRawISOHandler(raw1394handle_t handle, int channel, size_t length, quadlet_t *data); ! static int ar2VideBusResetHandler(raw1394handle_t handle, unsigned int generation); static int ar2VideoBufferInit(AR2VideoBufferT *buffer, int size); static int ar2VideoBufferClose(AR2VideoBufferT *buffer); ! static int ar2VideoBufferRaed(AR2VideoBufferT *buffer, ARUint8 *dest, int size, int flag); static int ar2VideoBufferWrite(AR2VideoBufferT *buffer, ARUint8 *src, int size, int flag); ! static ARUint8 *ar2VideoBufferRaedDv(AR2VideoParamT *vid); int arVideoDispOption( void ) --- 24,33 ---- static void ar2VideoCapture(AR2VideoParamT *vid); static int ar2VideoRawISOHandler(raw1394handle_t handle, int channel, size_t length, quadlet_t *data); ! static int ar2VideoBusResetHandler(raw1394handle_t handle, unsigned int generation); static int ar2VideoBufferInit(AR2VideoBufferT *buffer, int size); static int ar2VideoBufferClose(AR2VideoBufferT *buffer); ! static int ar2VideoBufferRead(AR2VideoBufferT *buffer, ARUint8 *dest, int size, int flag); static int ar2VideoBufferWrite(AR2VideoBufferT *buffer, ARUint8 *src, int size, int flag); ! static ARUint8 *ar2VideoBufferReadDV(AR2VideoParamT *vid); int arVideoDispOption( void ) *************** *** 238,242 **** { raw1394_set_userdata(vid->handle, vid); ! raw1394_set_bus_reset_handler(vid->handle, ar2VideBusResetHandler); raw1394_set_iso_handler(vid->handle, 63, ar2VideoRawISOHandler); if( raw1394_start_iso_rcv(vid->handle, 63) < 0 ) { --- 238,242 ---- { raw1394_set_userdata(vid->handle, vid); ! raw1394_set_bus_reset_handler(vid->handle, ar2VideoBusResetHandler); raw1394_set_iso_handler(vid->handle, 63, ar2VideoRawISOHandler); if( raw1394_start_iso_rcv(vid->handle, 63) < 0 ) { *************** *** 300,304 **** } ! static int ar2VideBusResetHandler(raw1394handle_t handle, unsigned int generation) { static int i = 0; --- 300,304 ---- } ! static int ar2VideoBusResetHandler(raw1394handle_t handle, unsigned int generation) { static int i = 0; *************** *** 316,323 **** ARUint8 *ar2VideoGetImage( AR2VideoParamT *vid ) { ! return ar2VideoBufferRaedDv( vid ); } ! static ARUint8 *ar2VideoBufferRaedDv(AR2VideoParamT *vid) { static int f = 1; --- 316,323 ---- ARUint8 *ar2VideoGetImage( AR2VideoParamT *vid ) { ! return ar2VideoBufferReadDV( vid ); } ! static ARUint8 *ar2VideoBufferReadDV(AR2VideoParamT *vid) { static int f = 1; *************** *** 362,371 **** } ! pitches[0] = 720*AR_PIX_SIZE; pixels[0] = vid->image; ! #ifdef AR_PIX_FORMAT_RGB dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_rgb, pixels, pitches ); #endif ! #ifdef AR_PIX_FORMAT_BGRA dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_bgr0, pixels, pitches ); #endif --- 362,371 ---- } ! pitches[0] = 720*AR_PIX_SIZE_DEFAULT; pixels[0] = vid->image; ! #ifdef AR_PIXEL_FORMAT_DEFAULT_RGB dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_rgb, pixels, pitches ); #endif ! #ifdef AR_PIXEL_FORMAT_DEFAULT_BGRA dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_bgr0, pixels, pitches ); #endif *************** *** 434,438 **** } ! static int ar2VideoBufferRaed(AR2VideoBufferT *buffer, ARUint8 *dest, int size, int flag) { ARUint8 *tmp; --- 434,438 ---- } ! static int ar2VideoBufferRead(AR2VideoBufferT *buffer, ARUint8 *dest, int size, int flag) { ARUint8 *tmp; |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:47:18
|
Update of /cvsroot/artoolkit/artoolkit/util/mk_patt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31254 Modified Files: mk_patt.c Log Message: Move pixel format from gsub_lite into global namespace. Index: mk_patt.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mk_patt.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mk_patt.c 15 Sep 2005 00:53:03 -0000 1.6 --- mk_patt.c 5 Apr 2006 05:47:14 -0000 1.7 *************** *** 118,122 **** if( arVideoOpen(vconf) < 0 ) exit(0); if( arVideoInqSize(&xsize, &ysize) < 0 ) exit(0); ! arMalloc( image, ARUint8, xsize*ysize*AR_PIX_SIZE ); printf("Image size (x,y) = (%d,%d)\n", xsize, ysize); --- 118,122 ---- if( arVideoOpen(vconf) < 0 ) exit(0); if( arVideoInqSize(&xsize, &ysize) < 0 ) exit(0); ! arMalloc( image, ARUint8, xsize*ysize*AR_PIX_SIZE_DEFAULT ); printf("Image size (x,y) = (%d,%d)\n", xsize, ysize); *************** *** 190,194 **** return; } ! img_copy( dataPtr, image, xsize*ysize*AR_PIX_SIZE ); arVideoCapNext(); --- 190,194 ---- return; } ! img_copy( dataPtr, image, xsize*ysize*AR_PIX_SIZE_DEFAULT ); arVideoCapNext(); |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:47:07
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31023 Modified Files: toc.html Log Message: Move pixel format from gsub_lite into global namespace. Index: toc.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/toc.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** toc.html 16 Aug 2005 00:49:33 -0000 1.4 --- toc.html 5 Apr 2006 05:47:02 -0000 1.5 *************** *** 31,35 **** <nobr> <a href="DataTypes/DataTypes.html#//apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF" target="doc">ARGL_CONTEXT_SETTINGS_REF</a></nobr><br> - <nobr> <a href="DataTypes/DataTypes.html#//apple_ref/c/tdef/ARGL_PIX_FORMAT" target="doc">ARGL_PIX_FORMAT</a></nobr><br> <h4><a href="Vars/Vars.html" target="doc">Globals</a></h4> --- 31,34 ---- |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:46:58
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30949 Modified Files: video.c Log Message: Move pixel format from gsub_lite into global namespace. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** video.c 8 Dec 2005 18:54:45 -0000 1.13 --- video.c 5 Apr 2006 05:46:53 -0000 1.14 *************** *** 1248,1266 **** // assign the one specified at compile-time as the default. if (!pixFormat) { ! #if defined(AR_PIX_FORMAT_2vuy) pixFormat = k2vuyPixelFormat; // k422YpCbCr8CodecType, k422YpCbCr8PixelFormat ! #elif defined(AR_PIX_FORMAT_yuvs) pixFormat = kYUVSPixelFormat; // kComponentVideoUnsigned ! #elif defined(AR_PIX_FORMAT_RGB) pixFormat = k24RGBPixelFormat; ! #elif defined(AR_PIX_FORMAT_BGR) pixFormat = k24BGRPixelFormat; ! #elif defined(AR_PIX_FORMAT_ARGB) pixFormat = k32ARGBPixelFormat; ! #elif defined(AR_PIX_FORMAT_RGBA) pixFormat = k32RGBAPixelFormat; ! #elif defined(AR_PIX_FORMAT_ABGR) pixFormat = k32ABGRPixelFormat; ! #elif defined(AR_PIX_FORMAT_BGRA) pixFormat = k32BGRAPixelFormat; #else --- 1248,1266 ---- // assign the one specified at compile-time as the default. if (!pixFormat) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) pixFormat = k2vuyPixelFormat; // k422YpCbCr8CodecType, k422YpCbCr8PixelFormat ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) pixFormat = kYUVSPixelFormat; // kComponentVideoUnsigned ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) pixFormat = k24RGBPixelFormat; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) pixFormat = k24BGRPixelFormat; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) pixFormat = k32ARGBPixelFormat; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) pixFormat = k32RGBAPixelFormat; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) pixFormat = k32ABGRPixelFormat; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) pixFormat = k32BGRAPixelFormat; #else |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:46:47
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30866 Modified Files: project.pbxproj Log Message: Move pixel format from gsub_lite into global namespace. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** project.pbxproj 8 Dec 2005 18:56:07 -0000 1.6 --- project.pbxproj 5 Apr 2006 05:46:41 -0000 1.7 *************** *** 4542,4549 **** ); inputPaths = ( ! $SRCROOT/include/AR/config.h.in, ); outputPaths = ( ! $SRCROOT/include/AR/config.h, ); runOnlyForDeploymentPostprocessing = 0; --- 4542,4549 ---- ); inputPaths = ( ! "$(SRCROOT)/include/AR/config.h.in", ); outputPaths = ( ! "$(SRCROOT)/include/AR/config.h", ); runOnlyForDeploymentPostprocessing = 0; |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:45:19
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29953 Modified Files: calib_distortion.dsp Log Message: Fix line endings. Index: calib_distortion.dsp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_distortion.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** calib_distortion.dsp 21 Sep 2005 17:56:22 -0000 1.3 --- calib_distortion.dsp 5 Apr 2006 05:45:14 -0000 1.4 *************** *** 1,114 **** ! # Microsoft Developer Studio Project File - Name="calib_distortion" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=calib_distortion - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "calib_distortion.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "calib_distortion.mak" CFG="calib_distortion - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "calib_distortion - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "calib_distortion - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "calib_distortion - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "NDEBUG" ! # ADD RSC /l 0x1409 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 libAR.lib libARvideo.lib libARgsub_lite.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\bin\calib_distortion.exe" /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ELSEIF "$(CFG)" == "calib_distortion - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "_DEBUG" ! # ADD RSC /l 0x1409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 libARd.lib libARvideod.lib libARgsub_lited.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\..\bin\calib_distortiond.exe" /pdbtype:sept /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ENDIF ! ! # Begin Target ! ! # Name "calib_distortion - Win32 Release" ! # Name "calib_distortion - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\calib_dist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\check_dist.c ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # Begin Source File ! ! SOURCE=.\calib_dist.h ! # End Source File ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project --- 1,114 ---- ! # Microsoft Developer Studio Project File - Name="calib_distortion" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=calib_distortion - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "calib_distortion.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "calib_distortion.mak" CFG="calib_distortion - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "calib_distortion - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "calib_distortion - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "calib_distortion - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "NDEBUG" ! # ADD RSC /l 0x1409 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 libAR.lib libARvideo.lib libARgsub_lite.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\bin\calib_distortion.exe" /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ELSEIF "$(CFG)" == "calib_distortion - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "_DEBUG" ! # ADD RSC /l 0x1409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 libARd.lib libARvideod.lib libARgsub_lited.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\..\bin\calib_distortiond.exe" /pdbtype:sept /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ENDIF ! ! # Begin Target ! ! # Name "calib_distortion - Win32 Release" ! # Name "calib_distortion - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\calib_dist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\check_dist.c ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # Begin Source File ! ! SOURCE=.\calib_dist.h ! # End Source File ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project |
|
From: Philip L. <phi...@us...> - 2006-04-05 05:45:13
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29627 Modified Files: calib_camera2.dsp Log Message: Fix line endings. Index: calib_camera2.dsp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera2.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** calib_camera2.dsp 21 Sep 2005 17:57:37 -0000 1.3 --- calib_camera2.dsp 5 Apr 2006 05:45:02 -0000 1.4 *************** *** 1,118 **** ! # Microsoft Developer Studio Project File - Name="calib_camera2" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=calib_camera2 - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "calib_camera2.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "calib_camera2.mak" CFG="calib_camera2 - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "calib_camera2 - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "calib_camera2 - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "calib_camera2 - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "NDEBUG" ! # ADD RSC /l 0x1409 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 libAR.lib libARvideo.lib libARgsub_lite.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\bin\calib_camera2.exe" /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ELSEIF "$(CFG)" == "calib_camera2 - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "_DEBUG" ! # ADD RSC /l 0x1409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 libARd.lib libARvideod.lib libARgsub_lited.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\..\bin\calib_camera2d.exe" /pdbtype:sept /libpath:"..\..\lib" ! # SUBTRACT LINK32 /pdb:none ! ! !ENDIF ! ! # Begin Target ! ! # Name "calib_camera2 - Win32 Release" ! # Name "calib_camera2 - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\calib_dist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\calib_inp.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\main.c ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # Begin Source File ! ! SOURCE=.\calib_camera.h ! # End Source File ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project --- 1,118 ---- ! # Microsoft Developer Studio Project File - Name="calib_camera2" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=calib_camera2 - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "calib_camera2.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "calib_camera2.mak" CFG="calib_camera2 - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "calib_camera2 - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "calib_camera2 - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "calib_camera2 - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "NDEBUG" ! # ADD RSC /l 0x1409 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 libAR.lib libARvideo.lib libARgsub_lite.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\bin\calib_camera2.exe" /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ELSEIF "$(CFG)" == "calib_camera2 - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "_DEBUG" ! # ADD RSC /l 0x1409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 libARd.lib libARvideod.lib libARgsub_lited.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\..\bin\calib_camera2d.exe" /pdbtype:sept /libpath:"..\..\lib" ! # SUBTRACT LINK32 /pdb:none ! ! !ENDIF ! ! # Begin Target ! ! # Name "calib_camera2 - Win32 Release" ! # Name "calib_camera2 - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\calib_dist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\calib_inp.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\main.c ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # Begin Source File ! ! SOURCE=.\calib_camera.h ! # End Source File ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project |
|
From: Philip L. <phi...@us...> - 2005-12-08 18:56:18
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29526 Modified Files: project.pbxproj Log Message: Fix info.plist location in collide example. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** project.pbxproj 12 Oct 2005 00:17:18 -0000 1.5 --- project.pbxproj 8 Dec 2005 18:56:07 -0000 1.6 *************** *** 1683,1686 **** --- 1683,1687 ---- 78A519D1089ABA58005197A0 /* twoView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = twoView.app; sourceTree = BUILT_PRODUCTS_DIR; }; 78A519E4089ABB07005197A0 /* twoView-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "twoView-Info.plist"; sourceTree = "<group>"; }; + 78C7675D091AF110004CF1D8 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; 78D25397089AA0640064B793 /* loadMultiple.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = loadMultiple.app; sourceTree = BUILT_PRODUCTS_DIR; }; 78D253B8089AA1380064B793 /* loadMultiple-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "loadMultiple-Info.plist"; sourceTree = "<group>"; }; *************** *** 2323,2326 **** --- 2324,2328 ---- 4A427D000484329800B56093 /* ar.h */, 4A427D010484329800B56093 /* arMulti.h */, + 78C7675D091AF110004CF1D8 /* config.h */, 4A427D030484329800B56093 /* config.h.in */, 4A8EA5AF0658754A00ADDDD1 /* gsub_lite.h */, *************** *** 6044,6048 **** buildSettings = { HEADER_SEARCH_PATHS = include; ! INFOPLIST_FILE = "collideTest-Info.plist"; INSTALL_PATH = "$(SRCROOT)/bin"; LIBRARY_SEARCH_PATHS = ( --- 6046,6050 ---- buildSettings = { HEADER_SEARCH_PATHS = include; ! INFOPLIST_FILE = "examples/collide/collideTest-Info.plist"; INSTALL_PATH = "$(SRCROOT)/bin"; LIBRARY_SEARCH_PATHS = ( *************** *** 6890,6893 **** --- 6892,6896 ---- ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Development; }; 7872EF6408E318C900DB266E /* Build configuration list for PBXNativeTarget "calib_cparam" */ = { *************** *** 6898,6901 **** --- 6901,6905 ---- ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Development; }; 7872EF7E08E3192200DB266E /* Build configuration list for PBXNativeTarget "calib_dist" */ = { *************** *** 6906,6909 **** --- 6910,6914 ---- ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Development; }; 7872EF9708E3196B00DB266E /* Build configuration list for PBXNativeTarget "mk_patt" */ = { *************** *** 6914,6917 **** --- 6919,6923 ---- ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Development; }; 788A85B1089AA558001AB56A /* Build configuration list for PBXNativeTarget "optical" */ = { |
|
From: Philip L. <phi...@us...> - 2005-12-08 18:54:55
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29207 Modified Files: video.c Log Message: Change locking requirement in arVideoGetImage, other minor fixes. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** video.c 30 Aug 2005 20:46:42 -0000 1.12 --- video.c 8 Dec 2005 18:54:45 -0000 1.13 *************** *** 83,86 **** --- 83,87 ---- #include <pthread.h> #include <sys/time.h> + #include <unistd.h> // usleep() #include <AR/config.h> #include <AR/ar.h> *************** *** 94,97 **** --- 95,99 ---- #define AR_VIDEO_DEBUG_BUFFERCOPY // Uncomment to have ar2VideoGetImage() return a copy of video pixel data. //#define AR_VIDEO_SUPPORT_OLD_QUICKTIME // Uncomment to allow use of non-thread safe QuickTime (pre-6.4). + //#define AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE #define AR_VIDEO_IDLE_INTERVAL_MILLISECONDS_MIN 20L *************** *** 263,267 **** if ((err = SGNewChannel(seqGrab, VideoMediaType, psgchanVideo))) { ! fprintf(stderr, "MakeSequenceGrabChannel(): SGNewChannel err=%ld\n", err); goto endFunc; } --- 265,273 ---- if ((err = SGNewChannel(seqGrab, VideoMediaType, psgchanVideo))) { ! if (err == couldntGetRequiredComponent) { ! printf("ERROR: No camera connected. Please connect a camera and re-try.\n"); ! } else { ! fprintf(stderr, "MakeSequenceGrabChannel(): SGNewChannel err=%ld\n", err); ! } goto endFunc; } *************** *** 333,337 **** if ((err = MakeSequenceGrabChannel(pVdg->seqGrab, &pVdg->sgchanVideo))) { ! fprintf(stderr, "MakeSequenceGrabChannel err=%d.\n", err); free(pVdg); return (NULL); --- 339,343 ---- if ((err = MakeSequenceGrabChannel(pVdg->seqGrab, &pVdg->sgchanVideo))) { ! if (err != couldntGetRequiredComponent) fprintf(stderr, "MakeSequenceGrabChannel err=%d.\n", err); free(pVdg); return (NULL); *************** *** 1026,1036 **** while (keepAlive && vdgIsGrabbing(vid->pVdg)) { gettimeofday(&tv, NULL); ts.tv_sec = tv.tv_sec; ! ts.tv_nsec = tv.tv_usec * 1000 + vid->milliSecPerTimer * 1E6; ! if (ts.tv_nsec >= 1E9) { ! ts.tv_nsec -= 1E9; ts.tv_sec += 1; } #ifdef AR_VIDEO_SUPPORT_OLD_QUICKTIME // Get a lock to access QuickTime (for SGIdle()), but only if more than one thread is running. --- 1032,1044 ---- while (keepAlive && vdgIsGrabbing(vid->pVdg)) { + #ifndef AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE gettimeofday(&tv, NULL); ts.tv_sec = tv.tv_sec; ! ts.tv_nsec = tv.tv_usec * 1000 + vid->milliSecPerTimer * 1000000; ! if (ts.tv_nsec >= 1000000000) { ! ts.tv_nsec -= 1000000000; ts.tv_sec += 1; } + #endif // AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE #ifdef AR_VIDEO_SUPPORT_OLD_QUICKTIME // Get a lock to access QuickTime (for SGIdle()), but only if more than one thread is running. *************** *** 1110,1114 **** vid->status |= AR_VIDEO_STATUS_BIT_READY; } ! err_i = pthread_cond_timedwait(&(vid->condition), &(vid->bufMutex), &ts); if (err_i != 0 && err_i != ETIMEDOUT) { --- 1118,1122 ---- vid->status |= AR_VIDEO_STATUS_BIT_READY; } ! #ifndef AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE err_i = pthread_cond_timedwait(&(vid->condition), &(vid->bufMutex), &ts); if (err_i != 0 && err_i != ETIMEDOUT) { *************** *** 1117,1120 **** --- 1125,1137 ---- break; } + #else + ar2VideoInternalUnlock(&(vid->bufMutex)); + usleep(vid->milliSecPerTimer * 1000); + if (!ar2VideoInternalLock(&(vid->bufMutex))) { + fprintf(stderr, "ar2VideoInternalThread(): Unable to lock mutex, exiting.\n"); + keepAlive = 0; + break; + } + #endif // AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE pthread_testcancel(); *************** *** 1339,1353 **** if(!(vid->pVdg = vdgAllocAndInit(grabber))) { ! fprintf(stderr, "ar2VideoOpen(): vdgAllocAndInit err=%ld\n", err); goto out1; } if (err = vdgRequestSettings(vid->pVdg, showDialog, gVidCount)) { ! fprintf(stderr, "ar2VideoOpen(): vdgRequestSettings err=%ld\n", err); goto out2; } if (err = vdgPreflightGrabbing(vid->pVdg)) { ! fprintf(stderr, "ar2VideoOpen(): vdgPreflightGrabbing err=%ld\n", err); goto out2; } --- 1356,1370 ---- if(!(vid->pVdg = vdgAllocAndInit(grabber))) { ! fprintf(stderr, "ar2VideoOpen(): vdgAllocAndInit returned error.\n"); goto out1; } if (err = vdgRequestSettings(vid->pVdg, showDialog, gVidCount)) { ! fprintf(stderr, "ar2VideoOpen(): vdgRequestSettings err=%ld.\n", err); goto out2; } if (err = vdgPreflightGrabbing(vid->pVdg)) { ! fprintf(stderr, "ar2VideoOpen(): vdgPreflightGrabbing err=%ld.\n", err); goto out2; } *************** *** 1359,1363 **** &vid->frameRate, &vid->bytesPerSecond)) { ! fprintf(stderr, "ar2VideoOpen(): vdgGetDataRate err=%ld\n", err); //goto out2; } --- 1376,1380 ---- &vid->frameRate, &vid->bytesPerSecond)) { ! fprintf(stderr, "ar2VideoOpen(): vdgGetDataRate err=%ld.\n", err); //goto out2; } *************** *** 1389,1393 **** // Report video size and compression type. ! fprintf(stdout, "Video cType is %c%c%c%c, size is %dx%d.\n", (char)(((*(vid->vdImageDesc))->cType >> 24) & 0xFF), (char)(((*(vid->vdImageDesc))->cType >> 16) & 0xFF), --- 1406,1410 ---- // Report video size and compression type. ! printf("Video cType is %c%c%c%c, size is %dx%d.\n", (char)(((*(vid->vdImageDesc))->cType >> 24) & 0xFF), (char)(((*(vid->vdImageDesc))->cType >> 16) & 0xFF), *************** *** 1746,1755 **** ARUint8 *pix = NULL; - // Need lock to guarantee this thread exclusive access to vid. - if (!ar2VideoInternalLock(&(vid->bufMutex))) { - fprintf(stderr, "ar2VideoGetImage(): Unable to lock mutex.\n"); - return (NULL); - } - // ar2VideoGetImage() used to block waiting for a frame. // This locked the OpenGL frame rate to the camera frame rate. --- 1763,1766 ---- *************** *** 1758,1761 **** --- 1769,1778 ---- if (vid->status & AR_VIDEO_STATUS_BIT_READY) { + // Need lock to guarantee this thread exclusive access to vid. + if (!ar2VideoInternalLock(&(vid->bufMutex))) { + fprintf(stderr, "ar2VideoGetImage(): Unable to lock mutex.\n"); + return (NULL); + } + //fprintf(stderr, "For vid @ %p got frame %ld.\n", vid, vid->frameCount); *************** *** 1783,1792 **** vid->status &= ~AR_VIDEO_STATUS_BIT_READY; // Clear ready bit. } - if (!ar2VideoInternalUnlock(&(vid->bufMutex))) { - fprintf(stderr, "ar2VideoGetImage(): Unable to unlock mutex.\n"); - return (NULL); - } return (pix); } --- 1800,1810 ---- vid->status &= ~AR_VIDEO_STATUS_BIT_READY; // Clear ready bit. + + if (!ar2VideoInternalUnlock(&(vid->bufMutex))) { + fprintf(stderr, "ar2VideoGetImage(): Unable to unlock mutex.\n"); + return (NULL); + } } return (pix); } |
|
From: Philip L. <phi...@us...> - 2005-12-08 18:52:00
|
Update of /cvsroot/artoolkit/artoolkit/include/AR/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28394 Modified Files: videoWin32DirectShow.h Log Message: Minor header correctness fixes. Index: videoWin32DirectShow.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoWin32DirectShow.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** videoWin32DirectShow.h 20 Oct 2005 19:55:58 -0000 1.2 --- videoWin32DirectShow.h 8 Dec 2005 18:51:47 -0000 1.3 *************** *** 1,58 **** ! /* ======================================================================== ! * PROJECT: DirectShow Video Processing Library ! * FILE: ARToolkit 2.6x WIN32/DirectShow video input ! * ======================================================================== ! * Author: Thomas Pintaric, Vienna University of Technology ! * Contact: pin...@im... http://ims.tuwien.ac.at/~thomas ! * ======================================================================= ! * ! * Copyright (C) 2003 Vienna University of Technology ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! * ! * For further information please contact Thomas Pintaric under ! * <pin...@im...> or write to Thomas Pintaric, ! * Vienna University of Technology, Favoritenstr. 9-11/188, A1040 Vienna, ! * Austria. ! * ========================================================================*/ ! /* ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. ! * ! * Rev Date Who Changes ! * 2.6.8 2004-07-20 PRL Rewrite for ARToolKit 2.68.2 ! * ! */ ! ! #ifndef AR_VIDEO_WIN32_DIRECTSHOW_H ! #define AR_VIDEO_WIN32_DIRECTSHOW_H ! ! #ifdef __cplusplus ! extern "C" { ! #endif ! ! #include <AR/config.h> ! #include <AR/ar.h> ! ! #include <stdio.h> ! #include <string.h> ! ! typedef struct _AR2VideoBufferT AR2VideoBufferT; ! typedef struct _AR2VideoParamT AR2VideoParamT; ! ! ! #ifdef __cplusplus ! } ! #endif ! #endif // AR_VIDEO_WIN32_DIRECTSHOW_H --- 1,59 ---- ! /* ======================================================================== ! * PROJECT: DirectShow Video Processing Library ! * FILE: ARToolkit 2.6x WIN32/DirectShow video input ! * ======================================================================== ! * Author: Thomas Pintaric, Vienna University of Technology ! * Contact: pin...@im... http://ims.tuwien.ac.at/~thomas ! * ======================================================================= ! * ! * Copyright (C) 2003 Vienna University of Technology ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! * ! * For further information please contact Thomas Pintaric under ! * <pin...@im...> or write to Thomas Pintaric, ! * Vienna University of Technology, Favoritenstr. 9-11/188, A1040 Vienna, ! * Austria. ! * ========================================================================*/ ! /* ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. ! * ! * Rev Date Who Changes ! * 2.6.8 2004-07-20 PRL Rewrite for ARToolKit 2.68.2 ! * ! */ ! ! #ifndef AR_VIDEO_WIN32_DIRECTSHOW_H ! #define AR_VIDEO_WIN32_DIRECTSHOW_H ! ! #include <AR/config.h> ! #include <AR/ar.h> ! ! #include <stdio.h> ! #include <string.h> ! ! #define AR_VIDEO_WIN32_DIRECTSHOW_2_71 ! ! #ifdef __cplusplus ! extern "C" { ! #endif ! ! typedef struct _AR2VideoBufferT AR2VideoBufferT; ! typedef struct _AR2VideoParamT AR2VideoParamT; ! ! #ifdef __cplusplus ! } ! #endif ! #endif // AR_VIDEO_WIN32_DIRECTSHOW_H |
|
From: Philip L. <phi...@us...> - 2005-12-08 18:51:53
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28360 Modified Files: videoWin32DirectShow.cpp Log Message: Minor header correctness fixes. Index: videoWin32DirectShow.cpp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/videoWin32DirectShow.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** videoWin32DirectShow.cpp 22 Sep 2005 02:10:24 -0000 1.4 --- videoWin32DirectShow.cpp 8 Dec 2005 18:51:41 -0000 1.5 *************** *** 35,40 **** * * Rev Date Who Changes ! * 2.6.8 2004-07-20 PRL Rewrite for ARToolKit 2.68.2 ! * 2.8.0 2004-07-20 PRL Incorporate DSVL-0.0.8b * */ --- 35,40 ---- * * Rev Date Who Changes ! * 2.68.2 2004-07-20 PRL Rewrite for ARToolKit 2.68.2 ! * 2.71.0 2005-08-05 PRL Incorporate DSVL-0.0.8b * */ |
|
From: Philip L. <phi...@us...> - 2005-10-20 19:56:21
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2091 Modified Files: video.h Log Message: Update copyright date. Index: video.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/video.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** video.h 24 Aug 2005 01:30:23 -0000 1.4 --- video.h 20 Oct 2005 19:56:03 -0000 1.5 *************** *** 1,4 **** /* -------------------------------------------------------------------------- ! * Copyright (c) 2004-2004 Philip Lamb (PRL) ph...@ed.... All rights reserved. * This file is part of ARToolKit. * --- 1,4 ---- /* -------------------------------------------------------------------------- ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * This file is part of ARToolKit. * |
|
From: Philip L. <phi...@us...> - 2005-10-20 19:56:08
|
Update of /cvsroot/artoolkit/artoolkit/include/AR/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2074 Modified Files: videoMacOSX.h videoWin32DirectShow.h Log Message: Update copyright date. Index: videoWin32DirectShow.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoWin32DirectShow.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** videoWin32DirectShow.h 4 Nov 2004 08:51:15 -0000 1.1.1.1 --- videoWin32DirectShow.h 20 Oct 2005 19:55:58 -0000 1.2 *************** *** 29,33 **** * ========================================================================*/ /* ! * Copyright (c) 2004-2004 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 29,33 ---- * ========================================================================*/ /* ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes Index: videoMacOSX.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoMacOSX.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** videoMacOSX.h 20 Jul 2005 22:28:42 -0000 1.5 --- videoMacOSX.h 20 Oct 2005 19:55:58 -0000 1.6 *************** *** 8,12 **** */ /* ! * Copyright (c) 2003-2004 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 8,12 ---- */ /* ! * Copyright (c) 2003-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes |
