[Openh323-cvs] pwlib/src/ptlib/common vconvert.cxx,1.45.2.6,1.45.2.7

[Damien S. <dsa...@us...>]

Update of /cvsroot/openh323/pwlib/src/ptlib/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24881/src/ptlib/common

Modified Files:
      Tag: Phobos
	vconvert.cxx 
Log Message:
Backport from HEAD.


Index: vconvert.cxx
===================================================================
RCS file: /cvsroot/openh323/pwlib/src/ptlib/common/vconvert.cxx,v
retrieving revision 1.45.2.6
retrieving revision 1.45.2.7
diff -C2 -d -r1.45.2.6 -r1.45.2.7
*** vconvert.cxx	23 Apr 2006 20:21:47 -0000	1.45.2.6
--- vconvert.cxx	30 Apr 2006 21:28:38 -0000	1.45.2.7
***************
*** 27,30 ****
--- 27,37 ----
   *
   * $Log$
+  * Revision 1.45.2.7  2006/04/30 21:28:38  dsandras
+  * Backport from HEAD.
+  *
+  * Revision 1.53  2006/04/30 21:26:46  dsandras
+  * Fixed green color problem when converting images in some of the color formats
+  * used by the iSight thanks to Luc Saillard <luc saillard org>.
+  *
   * Revision 1.45.2.6  2006/04/23 20:21:47  dsandras
   * Backported fix from HEAD.
***************
*** 2083,2087 ****
    BYTE *y, *u, *v;
    unsigned int x, h;  
!   unsigned int npixels = srcFrameWidth * srcFrameHeight;
  
    s = uyvy;
--- 2090,2094 ----
    BYTE *y, *u, *v;
    unsigned int x, h;  
!   unsigned int npixels = dstFrameWidth * dstFrameHeight;
  
    s = uyvy;
***************
*** 2090,2094 ****
    v = u + npixels/4;
  
!   if ( (dstFrameWidth * dstFrameHeight) > npixels ) {
  
       // dest is bigger than the source. No subsampling.
--- 2097,2101 ----
    v = u + npixels/4;
  
!   if ( (srcFrameWidth * srcFrameHeight) < npixels ) {
  
       // dest is bigger than the source. No subsampling.