[GEM-cvs] Gem/src/Base GemPixUtil.cpp,1.56,1.57

[IOhannes m z. <zmo...@us...>]

Update of /cvsroot/pd-gem/Gem/src/Base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28052/Base

Modified Files:
	GemPixUtil.cpp 
Log Message:
cleaned up setCSizeByFormat() to only one big (#ifdef __APPLE__ #else) instead of 6 of them: should be more readable

Index: GemPixUtil.cpp
===================================================================
RCS file: /cvsroot/pd-gem/Gem/src/Base/GemPixUtil.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** GemPixUtil.cpp	24 Apr 2006 19:16:10 -0000	1.56
--- GemPixUtil.cpp	9 Jun 2006 13:06:47 -0000	1.57
***************
*** 86,90 ****
      upsidedown(1)
  #else
!   upsidedown(0)
  #endif
  {}
--- 86,90 ----
      upsidedown(1)
  #else
!     upsidedown(0)
  #endif
  {}
***************
*** 219,257 ****
  
  GEM_EXTERN int imageStruct::setCsizeByFormat(int setformat) {
    switch(setformat){
!     case GL_LUMINANCE:  format=GL_LUMINANCE;  csize=1; type=GL_UNSIGNED_BYTE; break;
  
! #ifndef __APPLE__
!     case GL_RGB: format=GL_RGB;
! #else
!     case GL_RGB:
!     case GL_BGR_EXT: format=GL_BGR_EXT;
! #endif
!       type=GL_UNSIGNED_BYTE; csize =3; break;
      
! 	case GL_YUV422_GEM:
! #ifdef __APPLE__
!       type=GL_UNSIGNED_SHORT_8_8_REV_APPLE;
! #else
!       type=GL_UNSIGNED_BYTE;
! #endif
!       format=GL_YUV422_GEM; csize=2; break;
  
! #ifndef __APPLE__
!     case GL_RGBA:       format=GL_RGBA;     type=GL_UNSIGNED_BYTE;
! #else
!     case GL_RGBA:
!     case GL_BGRA_EXT:   format=GL_BGRA_EXT; type = GL_UNSIGNED_INT_8_8_8_8_REV;
! #endif
!       csize=4; break;
! 	  
! 	default:
! #ifdef __APPLE__
! 	  format=GL_YUV422_GEM; type=GL_UNSIGNED_SHORT_8_8_REV_APPLE; csize=2;
! #else
! 	  format=GL_RGBA; type=GL_UNSIGNED_BYTE; csize=4;
! #endif
! 	  break;
    }
    return csize;
  }
--- 219,278 ----
  
  GEM_EXTERN int imageStruct::setCsizeByFormat(int setformat) {
+ #ifdef __APPLE__
    switch(setformat){
!   case GL_LUMINANCE:  
!     format=GL_LUMINANCE;  
!     type  =GL_UNSIGNED_BYTE; 
!     csize =1; 
!     break;
  
!   case GL_YUV422_GEM:
!   default:
!     format=GL_YUV422_GEM; 
!     type  =GL_UNSIGNED_SHORT_8_8_REV_APPLE;
!     csize =2; 
!     break;
! 
!   case GL_RGB:  case GL_BGR_EXT: 
!     format=GL_BGR_EXT;    
!     type  =GL_UNSIGNED_BYTE; 
!     csize =3; 
!     break;
      
!   case GL_RGBA:  case GL_BGRA_EXT:   
!     format=GL_BGRA_EXT; 
!     type  =GL_UNSIGNED_INT_8_8_8_8_REV;
!     csize =4; 
!     break;
!   }
! #else /* !__APPLE__ */
!   switch(setformat){
!   case GL_LUMINANCE:  
!     format=GL_LUMINANCE;  
!     type=GL_UNSIGNED_BYTE; 
!     csize=1; 
!     break;
!     
!   case GL_YUV422_GEM:
!     format=GL_YUV422_GEM; 
!     type=GL_UNSIGNED_BYTE;
!     csize=2;
!     break;
!     
!   case GL_RGB: 
!     format=GL_RGB;
!     type=GL_UNSIGNED_BYTE; 
!     csize=3;
!     break;
  
!   case GL_RGBA:
!   default:
!     format=GL_RGBA;
!     type=GL_UNSIGNED_BYTE;
!     csize=4; 
!     break;
    }
+ #endif /* __APPLE__ */
+ 
    return csize;
  }