Merge in eglQueryString changes bug235_bringup_0
authorMatt Plumtree <matt.plumtree@nokia.com>
Thu, 07 Oct 2010 18:45:50 +0100
branchbug235_bringup_0
changeset 57 5bd121a46992
parent 56 40cc73c24bf8 (current diff)
parent 50 a7fcb1229472 (diff)
child 58 021dd2b9ee6a
Merge in eglQueryString changes
hostsupport/hostopenvg/src/sfAlphaRcp.h
hostsupport/hostopenvg/src/sfGammaLUT.h
--- a/holdingarea/vg/2D_OpenVG_1_1_SF/ri/src/sfAlphaRcp.h	Thu Oct 07 18:44:04 2010 +0100
+++ b/holdingarea/vg/2D_OpenVG_1_1_SF/ri/src/sfAlphaRcp.h	Thu Oct 07 18:45:50 2010 +0100
@@ -1,66 +1,44 @@
-/* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and /or associated documentation files
- * (the "Materials "), to deal in the Materials without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Materials,
- * and to permit persons to whom the Materials are furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Materials.
- *
- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR
- * THE USE OR OTHER DEALINGS IN THE MATERIALS.
- */
-
-#ifndef _SFALPHARCP_H_
-#define _SFALPHARCP_H_
-
-#include "riDefs.h"
-
-namespace OpenVGRI {
-enum { ALPHA_RCP_BITS = 8};
-static const RIuint16 sc_alphaRcp[256] = {
-    0xff00,  0xff00,  0x7f80,  0x5500,  0x3fc0,  0x3300,  0x2a80,  0x246e,  
-    0x1fe0,  0x1c55,  0x1980,  0x172f,  0x1540,  0x139e,  0x1237,  0x1100,  
-    0xff0,  0xf00,  0xe2b,  0xd6c,  0xcc0,  0xc25,  0xb97,  0xb16,  
-    0xaa0,  0xa33,  0x9cf,  0x972,  0x91b,  0x8cb,  0x880,  0x83a,  
-    0x7f8,  0x7ba,  0x780,  0x749,  0x715,  0x6e4,  0x6b6,  0x68a,  
-    0x660,  0x638,  0x612,  0x5ee,  0x5cc,  0x5ab,  0x58b,  0x56d,  
-    0x550,  0x534,  0x51a,  0x500,  0x4e7,  0x4d0,  0x4b9,  0x4a3,  
-    0x48e,  0x479,  0x466,  0x452,  0x440,  0x42e,  0x41d,  0x40c,  
-    0x3fc,  0x3ec,  0x3dd,  0x3ce,  0x3c0,  0x3b2,  0x3a5,  0x397,  
-    0x38b,  0x37e,  0x372,  0x366,  0x35b,  0x350,  0x345,  0x33a,  
-    0x330,  0x326,  0x31c,  0x313,  0x309,  0x300,  0x2f7,  0x2ee,  
-    0x2e6,  0x2dd,  0x2d5,  0x2cd,  0x2c6,  0x2be,  0x2b6,  0x2af,  
-    0x2a8,  0x2a1,  0x29a,  0x293,  0x28d,  0x286,  0x280,  0x27a,  
-    0x274,  0x26e,  0x268,  0x262,  0x25c,  0x257,  0x251,  0x24c,  
-    0x247,  0x242,  0x23d,  0x238,  0x233,  0x22e,  0x229,  0x225,  
-    0x220,  0x21c,  0x217,  0x213,  0x20e,  0x20a,  0x206,  0x202,  
-    0x1fe,  0x1fa,  0x1f6,  0x1f2,  0x1ef,  0x1eb,  0x1e7,  0x1e4,  
-    0x1e0,  0x1dc,  0x1d9,  0x1d6,  0x1d2,  0x1cf,  0x1cc,  0x1c9,  
-    0x1c5,  0x1c2,  0x1bf,  0x1bc,  0x1b9,  0x1b6,  0x1b3,  0x1b0,  
-    0x1ad,  0x1ab,  0x1a8,  0x1a5,  0x1a2,  0x1a0,  0x19d,  0x19b,  
-    0x198,  0x195,  0x193,  0x190,  0x18e,  0x18c,  0x189,  0x187,  
-    0x185,  0x182,  0x180,  0x17e,  0x17c,  0x179,  0x177,  0x175,  
-    0x173,  0x171,  0x16f,  0x16d,  0x16b,  0x169,  0x167,  0x165,  
-    0x163,  0x161,  0x15f,  0x15d,  0x15b,  0x159,  0x158,  0x156,  
-    0x154,  0x152,  0x150,  0x14f,  0x14d,  0x14b,  0x14a,  0x148,  
-    0x146,  0x145,  0x143,  0x142,  0x140,  0x13e,  0x13d,  0x13b,  
-    0x13a,  0x138,  0x137,  0x135,  0x134,  0x132,  0x131,  0x130,  
-    0x12e,  0x12d,  0x12b,  0x12a,  0x129,  0x127,  0x126,  0x125,  
-    0x123,  0x122,  0x121,  0x120,  0x11e,  0x11d,  0x11c,  0x11b,  
-    0x119,  0x118,  0x117,  0x116,  0x115,  0x113,  0x112,  0x111,  
-    0x110,  0x10f,  0x10e,  0x10d,  0x10c,  0x10a,  0x109,  0x108,  
-    0x107,  0x106,  0x105,  0x104,  0x103,  0x102,  0x101,  0x100,  
-};
-}
-#endif
-
+#ifndef _SFALPHARCP_H_
+#define _SFALPHARCP_H_
+
+#include "riDefs.h"
+
+namespace OpenVGRI {
+enum { ALPHA_RCP_BITS = 8};
+static const RIuint16 sc_alphaRcp[256] = {
+    0xff00,  0xff00,  0x7f80,  0x5500,  0x3fc0,  0x3300,  0x2a80,  0x246e,  
+    0x1fe0,  0x1c55,  0x1980,  0x172f,  0x1540,  0x139e,  0x1237,  0x1100,  
+    0xff0,  0xf00,  0xe2b,  0xd6c,  0xcc0,  0xc25,  0xb97,  0xb16,  
+    0xaa0,  0xa33,  0x9cf,  0x972,  0x91b,  0x8cb,  0x880,  0x83a,  
+    0x7f8,  0x7ba,  0x780,  0x749,  0x715,  0x6e4,  0x6b6,  0x68a,  
+    0x660,  0x638,  0x612,  0x5ee,  0x5cc,  0x5ab,  0x58b,  0x56d,  
+    0x550,  0x534,  0x51a,  0x500,  0x4e7,  0x4d0,  0x4b9,  0x4a3,  
+    0x48e,  0x479,  0x466,  0x452,  0x440,  0x42e,  0x41d,  0x40c,  
+    0x3fc,  0x3ec,  0x3dd,  0x3ce,  0x3c0,  0x3b2,  0x3a5,  0x397,  
+    0x38b,  0x37e,  0x372,  0x366,  0x35b,  0x350,  0x345,  0x33a,  
+    0x330,  0x326,  0x31c,  0x313,  0x309,  0x300,  0x2f7,  0x2ee,  
+    0x2e6,  0x2dd,  0x2d5,  0x2cd,  0x2c6,  0x2be,  0x2b6,  0x2af,  
+    0x2a8,  0x2a1,  0x29a,  0x293,  0x28d,  0x286,  0x280,  0x27a,  
+    0x274,  0x26e,  0x268,  0x262,  0x25c,  0x257,  0x251,  0x24c,  
+    0x247,  0x242,  0x23d,  0x238,  0x233,  0x22e,  0x229,  0x225,  
+    0x220,  0x21c,  0x217,  0x213,  0x20e,  0x20a,  0x206,  0x202,  
+    0x1fe,  0x1fa,  0x1f6,  0x1f2,  0x1ef,  0x1eb,  0x1e7,  0x1e4,  
+    0x1e0,  0x1dc,  0x1d9,  0x1d6,  0x1d2,  0x1cf,  0x1cc,  0x1c9,  
+    0x1c5,  0x1c2,  0x1bf,  0x1bc,  0x1b9,  0x1b6,  0x1b3,  0x1b0,  
+    0x1ad,  0x1ab,  0x1a8,  0x1a5,  0x1a2,  0x1a0,  0x19d,  0x19b,  
+    0x198,  0x195,  0x193,  0x190,  0x18e,  0x18c,  0x189,  0x187,  
+    0x185,  0x182,  0x180,  0x17e,  0x17c,  0x179,  0x177,  0x175,  
+    0x173,  0x171,  0x16f,  0x16d,  0x16b,  0x169,  0x167,  0x165,  
+    0x163,  0x161,  0x15f,  0x15d,  0x15b,  0x159,  0x158,  0x156,  
+    0x154,  0x152,  0x150,  0x14f,  0x14d,  0x14b,  0x14a,  0x148,  
+    0x146,  0x145,  0x143,  0x142,  0x140,  0x13e,  0x13d,  0x13b,  
+    0x13a,  0x138,  0x137,  0x135,  0x134,  0x132,  0x131,  0x130,  
+    0x12e,  0x12d,  0x12b,  0x12a,  0x129,  0x127,  0x126,  0x125,  
+    0x123,  0x122,  0x121,  0x120,  0x11e,  0x11d,  0x11c,  0x11b,  
+    0x119,  0x118,  0x117,  0x116,  0x115,  0x113,  0x112,  0x111,  
+    0x110,  0x10f,  0x10e,  0x10d,  0x10c,  0x10a,  0x109,  0x108,  
+    0x107,  0x106,  0x105,  0x104,  0x103,  0x102,  0x101,  0x100,  
+};
+}
+#endif
+
--- a/holdingarea/vg/2D_OpenVG_1_1_SF/ri/src/sfGammaLUT.h	Thu Oct 07 18:44:04 2010 +0100
+++ b/holdingarea/vg/2D_OpenVG_1_1_SF/ri/src/sfGammaLUT.h	Thu Oct 07 18:45:50 2010 +0100
@@ -1,100 +1,78 @@
-/* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and /or associated documentation files
- * (the "Materials "), to deal in the Materials without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Materials,
- * and to permit persons to whom the Materials are furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Materials.
- *
- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR
- * THE USE OR OTHER DEALINGS IN THE MATERIALS.
- */
-
-#ifndef _SFGAMMARCP_H_
-#define _SFGAMMARCP_H_
-
-#include "riDefs.h"
-
-namespace OpenVGRI {
-static const RIuint8 sc_sRGB_to_lRGB[256] = {
-    0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x1,  
-    0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  
-    0x1,  0x1,  0x2,  0x2,  0x2,  0x2,  0x2,  0x2,  
-    0x2,  0x2,  0x3,  0x3,  0x3,  0x3,  0x3,  0x4,  
-    0x4,  0x4,  0x4,  0x4,  0x5,  0x5,  0x5,  0x5,  
-    0x5,  0x6,  0x6,  0x6,  0x6,  0x7,  0x7,  0x7,  
-    0x8,  0x8,  0x8,  0x8,  0x9,  0x9,  0x9,  0xa,  
-    0xa,  0xa,  0xb,  0xb,  0xc,  0xc,  0xc,  0xd,  
-    0xd,  0xe,  0xe,  0xe,  0xf,  0xf,  0x10,  0x10,  
-    0x11,  0x11,  0x12,  0x12,  0x12,  0x13,  0x13,  0x14,  
-    0x15,  0x15,  0x16,  0x16,  0x17,  0x17,  0x18,  0x18,  
-    0x19,  0x1a,  0x1a,  0x1b,  0x1b,  0x1c,  0x1d,  0x1d,  
-    0x1e,  0x1f,  0x1f,  0x20,  0x21,  0x21,  0x22,  0x23,  
-    0x23,  0x24,  0x25,  0x26,  0x26,  0x27,  0x28,  0x29,  
-    0x29,  0x2a,  0x2b,  0x2c,  0x2d,  0x2d,  0x2e,  0x2f,  
-    0x30,  0x31,  0x32,  0x33,  0x33,  0x34,  0x35,  0x36,  
-    0x37,  0x38,  0x39,  0x3a,  0x3b,  0x3c,  0x3d,  0x3e,  
-    0x3f,  0x40,  0x41,  0x42,  0x43,  0x44,  0x45,  0x46,  
-    0x47,  0x48,  0x49,  0x4a,  0x4c,  0x4d,  0x4e,  0x4f,  
-    0x50,  0x51,  0x52,  0x54,  0x55,  0x56,  0x57,  0x58,  
-    0x5a,  0x5b,  0x5c,  0x5d,  0x5f,  0x60,  0x61,  0x63,  
-    0x64,  0x65,  0x67,  0x68,  0x69,  0x6b,  0x6c,  0x6d,  
-    0x6f,  0x70,  0x72,  0x73,  0x74,  0x76,  0x77,  0x79,  
-    0x7a,  0x7c,  0x7d,  0x7f,  0x80,  0x82,  0x83,  0x85,  
-    0x86,  0x88,  0x8a,  0x8b,  0x8d,  0x8e,  0x90,  0x92,  
-    0x93,  0x95,  0x97,  0x98,  0x9a,  0x9c,  0x9d,  0x9f,  
-    0xa1,  0xa3,  0xa4,  0xa6,  0xa8,  0xaa,  0xac,  0xad,  
-    0xaf,  0xb1,  0xb3,  0xb5,  0xb7,  0xb8,  0xba,  0xbc,  
-    0xbe,  0xc0,  0xc2,  0xc4,  0xc6,  0xc8,  0xca,  0xcc,  
-    0xce,  0xd0,  0xd2,  0xd4,  0xd6,  0xd8,  0xda,  0xdc,  
-    0xde,  0xe0,  0xe2,  0xe5,  0xe7,  0xe9,  0xeb,  0xed,  
-    0xef,  0xf2,  0xf4,  0xf6,  0xf8,  0xfa,  0xfd,  0xff,  
-};
-
-static const RIuint8 sc_lRGB_to_sRGB[256] = {
-    0x0,  0xd,  0x16,  0x1c,  0x21,  0x26,  0x2a,  0x2e,  
-    0x31,  0x35,  0x38,  0x3a,  0x3d,  0x40,  0x42,  0x44,  
-    0x47,  0x49,  0x4b,  0x4d,  0x4f,  0x51,  0x53,  0x55,  
-    0x56,  0x58,  0x5a,  0x5b,  0x5d,  0x5f,  0x60,  0x62,  
-    0x63,  0x65,  0x66,  0x67,  0x69,  0x6a,  0x6c,  0x6d,  
-    0x6e,  0x70,  0x71,  0x72,  0x73,  0x74,  0x76,  0x77,  
-    0x78,  0x79,  0x7a,  0x7b,  0x7d,  0x7e,  0x7f,  0x80,  
-    0x81,  0x82,  0x83,  0x84,  0x85,  0x86,  0x87,  0x88,  
-    0x89,  0x8a,  0x8b,  0x8c,  0x8d,  0x8e,  0x8f,  0x90,  
-    0x91,  0x92,  0x93,  0x93,  0x94,  0x95,  0x96,  0x97,  
-    0x98,  0x99,  0x9a,  0x9a,  0x9b,  0x9c,  0x9d,  0x9e,  
-    0x9f,  0x9f,  0xa0,  0xa1,  0xa2,  0xa3,  0xa3,  0xa4,  
-    0xa5,  0xa6,  0xa7,  0xa7,  0xa8,  0xa9,  0xaa,  0xaa,  
-    0xab,  0xac,  0xad,  0xad,  0xae,  0xaf,  0xaf,  0xb0,  
-    0xb1,  0xb2,  0xb2,  0xb3,  0xb4,  0xb4,  0xb5,  0xb6,  
-    0xb6,  0xb7,  0xb8,  0xb8,  0xb9,  0xba,  0xba,  0xbb,  
-    0xbc,  0xbc,  0xbd,  0xbe,  0xbe,  0xbf,  0xc0,  0xc0,  
-    0xc1,  0xc2,  0xc2,  0xc3,  0xc3,  0xc4,  0xc5,  0xc5,  
-    0xc6,  0xc7,  0xc7,  0xc8,  0xc8,  0xc9,  0xca,  0xca,  
-    0xcb,  0xcb,  0xcc,  0xcd,  0xcd,  0xce,  0xce,  0xcf,  
-    0xcf,  0xd0,  0xd1,  0xd1,  0xd2,  0xd2,  0xd3,  0xd3,  
-    0xd4,  0xd5,  0xd5,  0xd6,  0xd6,  0xd7,  0xd7,  0xd8,  
-    0xd8,  0xd9,  0xda,  0xda,  0xdb,  0xdb,  0xdc,  0xdc,  
-    0xdd,  0xdd,  0xde,  0xde,  0xdf,  0xdf,  0xe0,  0xe0,  
-    0xe1,  0xe2,  0xe2,  0xe3,  0xe3,  0xe4,  0xe4,  0xe5,  
-    0xe5,  0xe6,  0xe6,  0xe7,  0xe7,  0xe8,  0xe8,  0xe9,  
-    0xe9,  0xea,  0xea,  0xeb,  0xeb,  0xec,  0xec,  0xed,  
-    0xed,  0xed,  0xee,  0xee,  0xef,  0xef,  0xf0,  0xf0,  
-    0xf1,  0xf1,  0xf2,  0xf2,  0xf3,  0xf3,  0xf4,  0xf4,  
-    0xf5,  0xf5,  0xf6,  0xf6,  0xf6,  0xf7,  0xf7,  0xf8,  
-    0xf8,  0xf9,  0xf9,  0xfa,  0xfa,  0xfb,  0xfb,  0xfb,  
-    0xfc,  0xfc,  0xfd,  0xfd,  0xfe,  0xfe,  0xff,  0xff,  
-};
-}
-#endif
-
+#ifndef _SFGAMMARCP_H_
+#define _SFGAMMARCP_H_
+
+#include "riDefs.h"
+
+namespace OpenVGRI {
+static const RIuint8 sc_sRGB_to_lRGB[256] = {
+    0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x0,  0x1,  
+    0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  
+    0x1,  0x1,  0x2,  0x2,  0x2,  0x2,  0x2,  0x2,  
+    0x2,  0x2,  0x3,  0x3,  0x3,  0x3,  0x3,  0x4,  
+    0x4,  0x4,  0x4,  0x4,  0x5,  0x5,  0x5,  0x5,  
+    0x5,  0x6,  0x6,  0x6,  0x6,  0x7,  0x7,  0x7,  
+    0x8,  0x8,  0x8,  0x8,  0x9,  0x9,  0x9,  0xa,  
+    0xa,  0xa,  0xb,  0xb,  0xc,  0xc,  0xc,  0xd,  
+    0xd,  0xe,  0xe,  0xe,  0xf,  0xf,  0x10,  0x10,  
+    0x11,  0x11,  0x12,  0x12,  0x12,  0x13,  0x13,  0x14,  
+    0x15,  0x15,  0x16,  0x16,  0x17,  0x17,  0x18,  0x18,  
+    0x19,  0x1a,  0x1a,  0x1b,  0x1b,  0x1c,  0x1d,  0x1d,  
+    0x1e,  0x1f,  0x1f,  0x20,  0x21,  0x21,  0x22,  0x23,  
+    0x23,  0x24,  0x25,  0x26,  0x26,  0x27,  0x28,  0x29,  
+    0x29,  0x2a,  0x2b,  0x2c,  0x2d,  0x2d,  0x2e,  0x2f,  
+    0x30,  0x31,  0x32,  0x33,  0x33,  0x34,  0x35,  0x36,  
+    0x37,  0x38,  0x39,  0x3a,  0x3b,  0x3c,  0x3d,  0x3e,  
+    0x3f,  0x40,  0x41,  0x42,  0x43,  0x44,  0x45,  0x46,  
+    0x47,  0x48,  0x49,  0x4a,  0x4c,  0x4d,  0x4e,  0x4f,  
+    0x50,  0x51,  0x52,  0x54,  0x55,  0x56,  0x57,  0x58,  
+    0x5a,  0x5b,  0x5c,  0x5d,  0x5f,  0x60,  0x61,  0x63,  
+    0x64,  0x65,  0x67,  0x68,  0x69,  0x6b,  0x6c,  0x6d,  
+    0x6f,  0x70,  0x72,  0x73,  0x74,  0x76,  0x77,  0x79,  
+    0x7a,  0x7c,  0x7d,  0x7f,  0x80,  0x82,  0x83,  0x85,  
+    0x86,  0x88,  0x8a,  0x8b,  0x8d,  0x8e,  0x90,  0x92,  
+    0x93,  0x95,  0x97,  0x98,  0x9a,  0x9c,  0x9d,  0x9f,  
+    0xa1,  0xa3,  0xa4,  0xa6,  0xa8,  0xaa,  0xac,  0xad,  
+    0xaf,  0xb1,  0xb3,  0xb5,  0xb7,  0xb8,  0xba,  0xbc,  
+    0xbe,  0xc0,  0xc2,  0xc4,  0xc6,  0xc8,  0xca,  0xcc,  
+    0xce,  0xd0,  0xd2,  0xd4,  0xd6,  0xd8,  0xda,  0xdc,  
+    0xde,  0xe0,  0xe2,  0xe5,  0xe7,  0xe9,  0xeb,  0xed,  
+    0xef,  0xf2,  0xf4,  0xf6,  0xf8,  0xfa,  0xfd,  0xff,  
+};
+
+static const RIuint8 sc_lRGB_to_sRGB[256] = {
+    0x0,  0xd,  0x16,  0x1c,  0x21,  0x26,  0x2a,  0x2e,  
+    0x31,  0x35,  0x38,  0x3a,  0x3d,  0x40,  0x42,  0x44,  
+    0x47,  0x49,  0x4b,  0x4d,  0x4f,  0x51,  0x53,  0x55,  
+    0x56,  0x58,  0x5a,  0x5b,  0x5d,  0x5f,  0x60,  0x62,  
+    0x63,  0x65,  0x66,  0x67,  0x69,  0x6a,  0x6c,  0x6d,  
+    0x6e,  0x70,  0x71,  0x72,  0x73,  0x74,  0x76,  0x77,  
+    0x78,  0x79,  0x7a,  0x7b,  0x7d,  0x7e,  0x7f,  0x80,  
+    0x81,  0x82,  0x83,  0x84,  0x85,  0x86,  0x87,  0x88,  
+    0x89,  0x8a,  0x8b,  0x8c,  0x8d,  0x8e,  0x8f,  0x90,  
+    0x91,  0x92,  0x93,  0x93,  0x94,  0x95,  0x96,  0x97,  
+    0x98,  0x99,  0x9a,  0x9a,  0x9b,  0x9c,  0x9d,  0x9e,  
+    0x9f,  0x9f,  0xa0,  0xa1,  0xa2,  0xa3,  0xa3,  0xa4,  
+    0xa5,  0xa6,  0xa7,  0xa7,  0xa8,  0xa9,  0xaa,  0xaa,  
+    0xab,  0xac,  0xad,  0xad,  0xae,  0xaf,  0xaf,  0xb0,  
+    0xb1,  0xb2,  0xb2,  0xb3,  0xb4,  0xb4,  0xb5,  0xb6,  
+    0xb6,  0xb7,  0xb8,  0xb8,  0xb9,  0xba,  0xba,  0xbb,  
+    0xbc,  0xbc,  0xbd,  0xbe,  0xbe,  0xbf,  0xc0,  0xc0,  
+    0xc1,  0xc2,  0xc2,  0xc3,  0xc3,  0xc4,  0xc5,  0xc5,  
+    0xc6,  0xc7,  0xc7,  0xc8,  0xc8,  0xc9,  0xca,  0xca,  
+    0xcb,  0xcb,  0xcc,  0xcd,  0xcd,  0xce,  0xce,  0xcf,  
+    0xcf,  0xd0,  0xd1,  0xd1,  0xd2,  0xd2,  0xd3,  0xd3,  
+    0xd4,  0xd5,  0xd5,  0xd6,  0xd6,  0xd7,  0xd7,  0xd8,  
+    0xd8,  0xd9,  0xda,  0xda,  0xdb,  0xdb,  0xdc,  0xdc,  
+    0xdd,  0xdd,  0xde,  0xde,  0xdf,  0xdf,  0xe0,  0xe0,  
+    0xe1,  0xe2,  0xe2,  0xe3,  0xe3,  0xe4,  0xe4,  0xe5,  
+    0xe5,  0xe6,  0xe6,  0xe7,  0xe7,  0xe8,  0xe8,  0xe9,  
+    0xe9,  0xea,  0xea,  0xeb,  0xeb,  0xec,  0xec,  0xed,  
+    0xed,  0xed,  0xee,  0xee,  0xef,  0xef,  0xf0,  0xf0,  
+    0xf1,  0xf1,  0xf2,  0xf2,  0xf3,  0xf3,  0xf4,  0xf4,  
+    0xf5,  0xf5,  0xf6,  0xf6,  0xf6,  0xf7,  0xf7,  0xf8,  
+    0xf8,  0xf9,  0xf9,  0xfa,  0xfa,  0xfb,  0xfb,  0xfb,  
+    0xfc,  0xfc,  0xfd,  0xfd,  0xfe,  0xfe,  0xff,  0xff,  
+};
+}
+#endif
+
--- a/hostsupport/hostopenvg/src/sfAlphaRcp.h	Thu Oct 07 18:44:04 2010 +0100
+++ b/hostsupport/hostopenvg/src/sfAlphaRcp.h	Thu Oct 07 18:45:50 2010 +0100
@@ -1,25 +1,3 @@
-/* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and /or associated documentation files
- * (the "Materials "), to deal in the Materials without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Materials,
- * and to permit persons to whom the Materials are furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Materials.
- *
- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR
- * THE USE OR OTHER DEALINGS IN THE MATERIALS.
- */
-
 #ifndef _SFALPHARCP_H_
 #define _SFALPHARCP_H_
 
--- a/hostsupport/hostopenvg/src/sfGammaLUT.h	Thu Oct 07 18:44:04 2010 +0100
+++ b/hostsupport/hostopenvg/src/sfGammaLUT.h	Thu Oct 07 18:45:50 2010 +0100
@@ -1,25 +1,3 @@
-/* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and /or associated documentation files
- * (the "Materials "), to deal in the Materials without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Materials,
- * and to permit persons to whom the Materials are furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Materials.
- *
- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR
- * THE USE OR OTHER DEALINGS IN THE MATERIALS.
- */
-
 #ifndef _SFGAMMARCP_H_
 #define _SFGAMMARCP_H_