[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-video-dev
Subject:    [Video-dev] CR: Fix #include problem building for winscw (video)
From:       "Alberto Meza" <ameza () dextratech ! com>
Date:       2005-03-19 2:06:19
Message-ID: OAELJENFDCMGGAHMGLBLOEJLCBAA.ameza () dextratech ! com
[Download RAW message or body]

Modified by:ameza@dextratech.com
Reviewed by:
Date:3/10/2005
Project:Helix Symbian Port

Synopsis:	Fix problems with including headers building for code warrior

Overview:
Reorder the include order to fix error showed below:


colconverter/nostatic/444.c
colconverter/nostatic/444v565.c
colconverter/nostatic/565.c
colconverter/nostatic/rgb32torgb444.c
colconverter/nostatic/rgb444torgb444.c
colconverter/nostatic/rgbcommon.c
colconverter/nostatic/yuv2rgb.c
sitelib/symbian.pcf


Image Size and Heap Use impact: None
Platforms and Profiles Affected: symbian-81-winscw-emulator,
helix-client-s60-advanced
Distribution Libraries Affected: None
Distribution library impact and planned action: None
Platforms and Profiles Build Verified: symbian-81-winscw-emulator,
helix-client-s60-advanced
Branch: 150Cay


Copyright assignment:
I agree to assign to RealNetworks full copyright ownership of the code
represented by the attached patch. I warrant that I am legally entitled to
grant the copyright assignment and that my contribution does not violate any
law or breach any contract. I understand that RealNetworks may license this
code under RPSL, RCSL, and/or any other license at RealNetworks' sole
discretion.




Index: colconverter/nostatic/444.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/444.c,v
retrieving revision 1.3
diff -u -w -r1.3 444.c
--- colconverter/nostatic/444.c	9 Jul 2004 18:36:17 -0000	1.3
+++ colconverter/nostatic/444.c	16 Mar 2005 03:30:31 -0000
@@ -48,8 +48,8 @@
  * ***** END LICENSE BLOCK ***** */

 #include <stdlib.h>
-#include "nostatic/colorlib.h"
 #include "nostatic/yuv.h"
+#include "nostatic/colorlib.h"

 /*
  * Format-conversion routines.
Index: colconverter/nostatic/444v565.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/444v565.c,v
retrieving revision 1.3
diff -u -w -r1.3 444v565.c
--- colconverter/nostatic/444v565.c	9 Jul 2004 18:36:17 -0000	1.3
+++ colconverter/nostatic/444v565.c	16 Mar 2005 03:30:31 -0000
@@ -48,8 +48,8 @@
  * ***** END LICENSE BLOCK ***** */

 #include <stdlib.h>
-#include "nostatic/colorlib.h"
 #include "nostatic/yuv.h"
+#include "nostatic/colorlib.h"

 /*
  * Format-conversion routines.
Index: colconverter/nostatic/565.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/565.c,v
retrieving revision 1.3
diff -u -w -r1.3 565.c
--- colconverter/nostatic/565.c	9 Jul 2004 18:36:17 -0000	1.3
+++ colconverter/nostatic/565.c	16 Mar 2005 03:30:31 -0000
@@ -48,8 +48,8 @@
  * ***** END LICENSE BLOCK ***** */

 #include <stdlib.h>
-#include "nostatic/colorlib.h"
 #include "nostatic/yuv.h"
+#include "nostatic/colorlib.h"

 /*
  * Color conversion routines for converting YUV420 as produced by the
Index: colconverter/nostatic/rgb32torgb444.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/rgb32torgb444.c,v
retrieving revision 1.5
diff -u -w -r1.5 rgb32torgb444.c
--- colconverter/nostatic/rgb32torgb444.c	9 Jul 2004 18:36:17 -0000	1.5
+++ colconverter/nostatic/rgb32torgb444.c	16 Mar 2005 03:30:31 -0000
@@ -48,6 +48,7 @@
  * ***** END LICENSE BLOCK ***** */

 #include "hlxclib/string.h"
+#include "nostatic/yuv.h"
 #include "nostatic/colorlib.h"
 #include "nostatic/rgb.h"
 #include "nostatic/rgbcommon.h"

Index: colconverter/nostatic/rgb444torgb444.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/rgb444torgb444.c,v
retrieving revision 1.3
diff -u -w -r1.3 rgb444torgb444.c
--- colconverter/nostatic/rgb444torgb444.c	9 Jul 2004 18:36:17 -0000	1.3
+++ colconverter/nostatic/rgb444torgb444.c	16 Mar 2005 03:30:31 -0000
@@ -48,6 +48,7 @@
  * ***** END LICENSE BLOCK ***** */

 #include "hlxclib/string.h"
+#include "nostatic/yuv.h"
 #include "nostatic/colorlib.h"
 #include "nostatic/rgb.h"
 #include "nostatic/rgbcommon.h"
Index: colconverter/nostatic/rgbcommon.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/rgbcommon.c,v
retrieving revision 1.2
diff -u -w -r1.2 rgbcommon.c
--- colconverter/nostatic/rgbcommon.c	9 Jul 2004 18:36:17 -0000	1.2
+++ colconverter/nostatic/rgbcommon.c	16 Mar 2005 03:30:31 -0000
@@ -48,6 +48,7 @@
  * ***** END LICENSE BLOCK ***** */

 #include "hlxclib/string.h"
+#include "nostatic/yuv.h"
 #include "nostatic/colorlib.h"
 #include "nostatic/rgb.h"
 #include "nostatic/rgbcommon.h"
Index: colconverter/nostatic/yuv2rgb.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/yuv2rgb.c,v
retrieving revision 1.3
diff -u -w -r1.3 yuv2rgb.c
--- colconverter/nostatic/yuv2rgb.c	9 Jul 2004 18:36:17 -0000	1.3
+++ colconverter/nostatic/yuv2rgb.c	16 Mar 2005 03:30:31 -0000
@@ -48,8 +48,8 @@
  * ***** END LICENSE BLOCK ***** */

 #include <math.h>
-#include "nostatic/colorlib.h"
 #include "nostatic/yuv.h"
+#include "nostatic/colorlib.h"

 /* macros to check big/little endiannes of the system: */
 //const static union {char c[4]; unsigned int l;} _1234 =
{"\001\002\003\004"};
Index: sitelib/symbian.pcf
===================================================================
RCS file: /cvsroot/video/sitelib/symbian.pcf,v
retrieving revision 1.5
diff -u -w -r1.5 symbian.pcf
--- sitelib/symbian.pcf	26 Jul 2004 06:42:53 -0000	1.5
+++ sitelib/symbian.pcf	17 Mar 2005 16:44:16 -0000
@@ -70,6 +70,9 @@
                      '../../client/videosvc/pub'
                      )

+if (project.IsDefined('__CW32__')):
+        project.AddIncludes('../colconverter/pub/nostatic')
+
 project.AddSources('platform/symbian/minisymbiansurf.cpp',
                    'platform/symbian/minisymbiansite.cpp')


["video.patch" (application/octet-stream)]

Index: colconverter/nostatic/444.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/444.c,v
retrieving revision 1.3
diff -u -w -r1.3 444.c
--- colconverter/nostatic/444.c	9 Jul 2004 18:36:17 -0000	1.3
+++ colconverter/nostatic/444.c	16 Mar 2005 03:30:31 -0000
@@ -48,8 +48,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
-#include "nostatic/colorlib.h"
 #include "nostatic/yuv.h"
+#include "nostatic/colorlib.h"
 
 /*
  * Format-conversion routines.
Index: colconverter/nostatic/444v565.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/444v565.c,v
retrieving revision 1.3
diff -u -w -r1.3 444v565.c
--- colconverter/nostatic/444v565.c	9 Jul 2004 18:36:17 -0000	1.3
+++ colconverter/nostatic/444v565.c	16 Mar 2005 03:30:31 -0000
@@ -48,8 +48,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
-#include "nostatic/colorlib.h"
 #include "nostatic/yuv.h"
+#include "nostatic/colorlib.h"
 
 /*
  * Format-conversion routines.
Index: colconverter/nostatic/565.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/565.c,v
retrieving revision 1.3
diff -u -w -r1.3 565.c
--- colconverter/nostatic/565.c	9 Jul 2004 18:36:17 -0000	1.3
+++ colconverter/nostatic/565.c	16 Mar 2005 03:30:31 -0000
@@ -48,8 +48,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <stdlib.h>
-#include "nostatic/colorlib.h"
 #include "nostatic/yuv.h"
+#include "nostatic/colorlib.h"
 
 /*
  * Color conversion routines for converting YUV420 as produced by the
Index: colconverter/nostatic/rgb32torgb444.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/rgb32torgb444.c,v
retrieving revision 1.5
diff -u -w -r1.5 rgb32torgb444.c
--- colconverter/nostatic/rgb32torgb444.c	9 Jul 2004 18:36:17 -0000	1.5
+++ colconverter/nostatic/rgb32torgb444.c	16 Mar 2005 03:30:31 -0000
@@ -48,6 +48,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "hlxclib/string.h"
+#include "nostatic/yuv.h"
 #include "nostatic/colorlib.h"
 #include "nostatic/rgb.h"
 #include "nostatic/rgbcommon.h"
Index: colconverter/nostatic/rgb444torgb444.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/rgb444torgb444.c,v
retrieving revision 1.3
diff -u -w -r1.3 rgb444torgb444.c
--- colconverter/nostatic/rgb444torgb444.c	9 Jul 2004 18:36:17 -0000	1.3
+++ colconverter/nostatic/rgb444torgb444.c	16 Mar 2005 03:30:31 -0000
@@ -48,6 +48,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "hlxclib/string.h"
+#include "nostatic/yuv.h"
 #include "nostatic/colorlib.h"
 #include "nostatic/rgb.h"
 #include "nostatic/rgbcommon.h"
Index: colconverter/nostatic/rgbcommon.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/rgbcommon.c,v
retrieving revision 1.2
diff -u -w -r1.2 rgbcommon.c
--- colconverter/nostatic/rgbcommon.c	9 Jul 2004 18:36:17 -0000	1.2
+++ colconverter/nostatic/rgbcommon.c	16 Mar 2005 03:30:31 -0000
@@ -48,6 +48,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "hlxclib/string.h"
+#include "nostatic/yuv.h"
 #include "nostatic/colorlib.h"
 #include "nostatic/rgb.h"
 #include "nostatic/rgbcommon.h"
Index: colconverter/nostatic/yuv2rgb.c
===================================================================
RCS file: /cvsroot/video/colconverter/nostatic/yuv2rgb.c,v
retrieving revision 1.3
diff -u -w -r1.3 yuv2rgb.c
--- colconverter/nostatic/yuv2rgb.c	9 Jul 2004 18:36:17 -0000	1.3
+++ colconverter/nostatic/yuv2rgb.c	16 Mar 2005 03:30:31 -0000
@@ -48,8 +48,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <math.h>
-#include "nostatic/colorlib.h"
 #include "nostatic/yuv.h"
+#include "nostatic/colorlib.h"
 
 /* macros to check big/little endiannes of the system: */
 //const static union {char c[4]; unsigned int l;} _1234 = {"\001\002\003\004"};
Index: sitelib/symbian.pcf
===================================================================
RCS file: /cvsroot/video/sitelib/symbian.pcf,v
retrieving revision 1.5
diff -u -w -r1.5 symbian.pcf
--- sitelib/symbian.pcf	26 Jul 2004 06:42:53 -0000	1.5
+++ sitelib/symbian.pcf	17 Mar 2005 16:44:16 -0000
@@ -70,6 +70,9 @@
                      '../../client/videosvc/pub'
                      )
  
+if (project.IsDefined('__CW32__')): 
+        project.AddIncludes('../colconverter/pub/nostatic')
+
 project.AddSources('platform/symbian/minisymbiansurf.cpp',
                    'platform/symbian/minisymbiansite.cpp')
             


[prev in list] [next in list] [prev in thread] [next in thread]