flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1342455 [1/2] - in /incubator/flex/trunk: ./ frameworks/projects/flash-integration/ frameworks/projects/framework/src/mx/effects/easing/ frameworks/projects/framework/src/mx/graphics/shaderClasses/ frameworks/projects/spark/src/spark/effec...
Date Thu, 24 May 2012 21:59:15 GMT
Author: cframpton
Date: Thu May 24 21:59:13 2012
New Revision: 1342455

URL: http://svn.apache.org/viewvc?rev=1342455&view=rev
Log:
RAT work.  Use rat-check target in build.xml to generate rat.log (read comment above target since you need to put rat jars in ant classpath).  

There are still some binaries in here which need to be removed and some possible exceptions.
The .pbj files are generated by building the  corresponding .pbk file with the Adobe Pixel Bender Toolkit which seems to be available for download.

Unapproved licenses:

  /Users/cframpto/dev/trunk/temp/frameworks/localFonts.ser
  /Users/cframpto/dev/trunk/temp/frameworks/macFonts.ser
  /Users/cframpto/dev/trunk/temp/frameworks/projects/airframework/assets/Assets.swf
  /Users/cframpto/dev/trunk/temp/frameworks/projects/airframework/assets/ComputerIcon.ai
  /Users/cframpto/dev/trunk/temp/frameworks/projects/framework/asdoc/en_US/mx/controls/examples/assets/TransportButtons.swf
  /Users/cframpto/dev/trunk/temp/frameworks/projects/framework/assets/Assets.swf
  /Users/cframpto/dev/trunk/temp/frameworks/projects/framework/src/mx/graphics/shaderClasses/LuminosityMaskFilter.pbj
  /Users/cframpto/dev/trunk/temp/frameworks/projects/spark/src/spark/effects/CrossFade.pbj
  /Users/cframpto/dev/trunk/temp/frameworks/projects/spark/src/spark/effects/WipeDown.pbj
  /Users/cframpto/dev/trunk/temp/frameworks/projects/spark/src/spark/effects/WipeLeft.pbj
  /Users/cframpto/dev/trunk/temp/frameworks/projects/spark/src/spark/effects/WipeRight.pbj
  /Users/cframpto/dev/trunk/temp/frameworks/projects/spark/src/spark/effects/WipeUp.pbj
  /Users/cframpto/dev/trunk/temp/frameworks/themes/AeonGraphical/AeonGraphical.swf
  /Users/cframpto/dev/trunk/temp/frameworks/winFonts.ser
  /Users/cframpto/dev/trunk/temp/modules/compiler/src/java/flex2/compiler/swc/zip/ant-NOTICE.txt
  /Users/cframpto/dev/trunk/temp/modules/thirdparty/batik/sources/org/w3c/css/sac/LexicalUnit.java
  /Users/cframpto/dev/trunk/temp/modules/thirdparty/xerces-patch/src/java/META-INF/services/javax.xml.parsers.SAXParserFactory
  /Users/cframpto/dev/trunk/temp/modules/thirdparty/xerces-patch/src/java/META-INF/services/org.apache.xerces.xni.parser.XMLParserConfiguration
  /Users/cframpto/dev/trunk/temp/modules/thirdparty/xerces-patch/src/java/org/apache/xerces/jaxp/javax.xml.parsers.SAXParserFactory

Modified:
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/frameworks/projects/flash-integration/FlexComponentKit.mxi
    incubator/flex/trunk/frameworks/projects/framework/src/mx/effects/easing/easing_readme.txt
    incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Color.pbk
    incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorBurn.pbk
    incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorDodge.pbk
    incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Exclusion.pbk
    incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Hue.pbk
    incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Luminosity.pbk
    incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/LuminosityMaskFilter.pbk
    incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Saturation.pbk
    incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/SoftLight.pbk
    incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/CrossFade.pbk
    incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeDown.pbk
    incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeLeft.pbk
    incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeRight.pbk
    incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeUp.pbk
    incubator/flex/trunk/modules/antTasks/SPEC
    incubator/flex/trunk/modules/antTasks/flexTasks-internal.tasks
    incubator/flex/trunk/modules/antTasks/flexTasks.tasks
    incubator/flex/trunk/modules/compiler/src/java/flash/svg/SpriteTranscoder.java
    incubator/flex/trunk/modules/debugger/src/java/flash/util/URLEncoder.java
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_br.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_de.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_dk.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_en.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_es.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_fi.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_fr.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_it.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_ja.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_ko_kr.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_nl.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_no.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_ru.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_se.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_zh_cn.txt
    incubator/flex/trunk/modules/debugger/src/java/flex/tools/debugger/cli/fdbhelp_zh_tw.txt
    incubator/flex/trunk/modules/swfutils/src/java/flash/graphics/g2d/GraphicContext.java
    incubator/flex/trunk/modules/thirdparty/batik/sources/batik-all-flex.mf

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Thu May 24 21:59:13 2012
@@ -134,9 +134,26 @@
             unless="AIR_HOME.set"/>
     </target>
     
-    <!-- ToDo: automate setting the build number for non-dev builds. -->
-    <target name="create-description">
+    <target name="create-description" description="Generate flex-sdk-description.xml">
         <echo file="${basedir}/flex-sdk-description.xml">&lt;?xml version="1.0"?&gt;
+&lt;!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+--&gt;
 &lt;flex-sdk-description&gt;
 &lt;name&gt;${release}&lt;/name&gt;
 &lt;version&gt;${release.version}&lt;/version&gt;
@@ -206,6 +223,8 @@
         <delete file="${basedir}/frameworks/tests/fxgCompile/fxgCompileTest.swf" failonerror="false"/>
         <delete file="${basedir}/frameworks/tests/graphics/GraphicTags_checkin.swf" failonerror="false"/>
         <delete file="${basedir}/frameworks/tests/basicTests/BasicTests.swf" failonerror="false"/>
+        <delete file="${basedir}/frameworks/tests/basicTests/spark/views/HelloWorld.swf" failonerror="false"/>
+        <delete file="${basedir}/frameworks/tests/basicTests/spark/views/StyleManagerModuleTest.swf" failonerror="false"/>
         <delete file="${basedir}/mustella/MustellaResultsParser.class" failonerror="false"/>
         <!-- not currently in Apache Flex -->
         <!--
@@ -236,12 +255,6 @@
         <property name="antTasks.compiled" value="true"/>
     </target>
 
-    <target name="test" description="Build src.depend JARs">
-        <echo message="test basedir ${basedir}"/>
-        <ant antfile="${basedir}/modules/build.xml" target="test"/>     
-        <ant antfile="${basedir}/frameworks/build.xml" target="test"/>     
-    </target>
-
     <!--
         Build framework SWCs
     -->
@@ -443,7 +456,7 @@
                 <include name="**"/>
                 <exclude name="**/libs/**"/>
                 <exclude name="**/*.swc"/>
-                <exclude name="test*/**"/>
+                <!--exclude name="test*/**"/-->
                 <exclude name="projects/automation*/**"/>
                 <exclude name="projects/air/**"/>
                 <exclude name="projects/textLayout/**"/>
@@ -452,14 +465,6 @@
             </fileset>
         </copy>
 
-        <!-- frameworks/textLayout -->
-        <copy todir="${basedir}/temp/frameworks/projects/textLayout" includeEmptyDirs="false">
-            <fileset dir="${basedir}/frameworks/projects/textLayout">
-                <include name="build.xml"/>
-                <include name=".settings/**"/>
-            </fileset>
-        </copy>
-          
         <!-- now that air-config.xml and flex-config.xml are in temp, fix them up for release. -->
         <fix-config-file file="${basedir}/temp/frameworks/air-config.xml" />
         <fix-config-file file="${basedir}/temp/frameworks/flex-config.xml" />
@@ -495,6 +500,8 @@
                 <exclude name="compiler/**/TokenMgrError.java"/>
                 <exclude name="thirdparty/*/merged/**"/>
                 <exclude name="**/classes/**"/>
+                <exclude name="**/.classpath"/>
+                <exclude name="**/.project"/>
             </fileset>
         </copy>  
     </target>
@@ -1377,17 +1384,24 @@
     
     <!-- Runs Apache Rat against the source code, to spot any files -->
     <!--  which are missing the correct license headers -->
-    <!-- You need to download rat from http://incubator.apache.org/rat/ -->
-    <!--  and place the Rat jar into your ant lib before running -->
-    <target name="rat-check">
-       <typedef resource="org/apache/rat/anttasks/antlib.xml"
+    <!-- You need to place apache-rat-tasks-0.8.jar and apache-rat-0.8.jar -->
+    <!--  into your ant lib before running this target. -->
+    <target name="rat-check" description="Report licenses in source kit">
+    
+        <!-- Stage the src kit files in the temp directory. -->
+        <property name="no.zip" value="set" />
+        <antcall target="source-release"/>
+        
+        <!-- Run Rat on the staged files to check for license violations. -->
+        <property name="rat.dir" value="${basedir}/temp"/>
+        <echo message="Checking files at ${rat.dir}, report is ${basedir}/rat.log"/>
+        <typedef resource="org/apache/rat/anttasks/antlib.xml"
              uri="antlib:org.apache.rat.anttasks"/>
-       <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${basedir}/rat.log">
-           <fileset dir="${basedir}">
-              <exclude name="modules/compiler/src/**" />
-              <exclude name="**/.project" />
-           </fileset>
-       </rat:report>
+        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" 
+            reportFile="${basedir}/rat.log">
+            <fileset dir="${rat.dir}">
+                <exclude name="modules/asc/src/**" />
+            </fileset>
+        </rat:report>
     </target>
-
 </project>

Modified: incubator/flex/trunk/frameworks/projects/flash-integration/FlexComponentKit.mxi
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/flash-integration/FlexComponentKit.mxi?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/flash-integration/FlexComponentKit.mxi (original)
+++ incubator/flex/trunk/frameworks/projects/flash-integration/FlexComponentKit.mxi Thu May 24 21:59:13 2012
@@ -1,102 +1,25 @@
 <macromedia-extension name="Flex Component Kit" version="2.0.0" type="flashcomponent" requires-restart="true">

-  <author name="Adobe Systems Incorporated" />

+  <author name="The Apache Software Foundation" />

   <description><![CDATA[Flex Component Kit for Flash Professional]]></description>

   <products>

     <product name="Flash" version="10" primary="true" required="true" />

   </products>

   <license-agreement><![CDATA[

-	

-	ADOBE SYSTEMS INCORPORATED

-	<br>

-	Adobe Flex Component Kit for Adobe Flash Software License Agreement

-	<br>

-	NOTICE TO USER:  THIS LICENSE AGREEMENT GOVERNS INSTALLATION AND USE OF THE ADOBE SOFTWARE DESCRIBED HEREIN BY LICENSEES OF SUCH SOFTWARE.  LICENSEE AGREES THAT THIS AGREEMENT IS LIKE ANY WRITTEN NEGOTIATED AGREEMENT SIGNED BY LICENSEE.  BY CLICKING TO ACKNOWLEDGE AGREEMENT TO BE BOUND DURING REVIEW OF AN ELECTRONIC VERSION OF THIS LICENSE, OR DOWNLOADING, COPYING, INSTALLING OR USING THE SOFTWARE, LICENSEE ACCEPTS ALL THE TERMS AND CONDITIONS OF THIS AGREEMENT.  THIS AGREEMENT IS ENFORCEABLE AGAINST ANY PERSON OR ENTITY THAT INSTALLS AND USES THE SOFTWARE AND ANY PERSON OR ENTITY (E.G., SYSTEM INTEGRATOR, CONSULTANT OR CONTRACTOR) THAT INSTALLS OR USES THE SOFTWARE ON ANOTHER PERSON'S OR ENTITY'S BEHALF.

-	<br>

-	LICENSEE'S RIGHTS UNDER THIS AGREEMENT MAY BE SUBJECT TO ADDITIONAL TERMS AND CONDITIONS IN A SEPARATE WRITTEN AGREEMENT WITH ADOBE THAT SUPPLEMENTS OR SUPERSEDES ALL OR PORTIONS OF THIS AGREEMENT.

-	<br>

-	1.     Definitions

-	<br>

-	1.1    "Adobe" means Adobe Systems Incorporated, a Delaware corporation, 345 Park Avenue, San Jose, California 95110, if subsection 6(a) of this Agreement applies; otherwise it means Adobe Systems Software Ireland Limited, Unit 3100, Lake Drive, City West Campus, Saggart D24, Dublin, Republic of Ireland, a company organized under the laws of Ireland and an affiliate and licensee of Adobe Systems Incorporated.

-	<br>

-	1.2    "Authorized Users" means employees and individual contractors (i.e., temporary employees) of Licensee.

-	<br>

-	1.3    "Computer" means one or more central processing units ("CPU") in a hardware device (including hardware devices accessed by multiple users through a network ("Server")) that accepts information in digital or similar form and manipulates it for a specific result based on a sequence of instructions.

-	<br>

-	1.4    "Developer Programs" shall mean programs that are built consisting partly of the Source Files and partly of user's Material Improvement to add to or extend the Source Files.  

-	<br>

-	1.5	   "Documentation" means the user manuals and/or technical publications as applicable, relating to installation, use and administration of the Software.

-	<br>

-	1.6    "End User License Agreement" means an end user license agreement that provides a: (1) limited, nonexclusive right to use the subject Developer Program; (2) set of provisions that ensures that any sublicensee of Licensee exercising the rights in such End User License Agreement complies with all restrictions and obligations set forth herein with respect to the Software; (3) prohibition against reverse engineering, decompiling, disassembling or otherwise attempting to discover the source code of the subject Developer Program that is substantially similar to that set forth in Section 2.2.4 below; (4) statement that, if Licensee's customer requires any Adobe software in order to use the Developer Program, (i) Licensee's customer must obtain such Adobe software via a valid license, and (ii) Licensee's customer's use of such Adobe software must be in accordance with the terms and conditions of the end user license agreement that ships with such Adobe software;  (5) statemen
 t that Licensee and its suppliers retain all right, title and interest in the subject Developer Program that is substantially similar to that set forth as Section 3 below, (6) statement that Licensee's suppliers disclaim all warranties, conditions, representations or terms with respect to the subject Developer Program, and (7) limit of liability that disclaims all liability for the benefit of Licensee's suppliers.

-	<br>

-	1.7    "Internal Network" means Licensee's private, proprietary network resource accessible only by Authorized Users.  "Internal Network" specifically excludes the Internet (as such term is commonly defined) or any other network community open to the public, including membership or subscription driven groups, associations or similar organizations.  Connection by secure links such as VPN or dial up to Licensee's Internal Network for the purpose of allowing Authorized Users to use the Software should be deemed use over an Internal Network.

-	<br>

-	1.8    "Material Improvement" shall mean perceptible, measurable and definable improvements to the Source Files that provide extended or additional significant and primary functionality that add significant business value to the Source Files.

-	<br>

-	1.9    "Software" means the files, libraries, and executables including all Documentation and other materials provided by Adobe to Licensee under this Agreement,  and any modified versions and copies of, and upgrades, updates and additions to such Software, provided to Licensee by Adobe at any time, to the extent not provided under a separate agreement, including the Source Files, build files, compilers, and related information, as well as the file format specifications, if any, included as part of the Software as described in the Documentation or a "Read Me" file accompanying the applicable Software.

-	<br>

-	1.10   "Source Files" shall mean the source code files that are provided with the Software.   

-	<br>

-	2.     License.  Subject to the terms and conditions of this Agreement, Adobe grants to Licensee a perpetual, non-exclusive license to use the Software delivered hereunder according to the terms and conditions of this Agreement, on Computers connected to Licensee's Internal Network, on the licensed platforms and configurations, in the manner and for the purposes described in the Documentation. In the event Licensee fails to comply with any terms of this Agreement, Adobe may terminate the license, upon which Licensee must cease using the Software and uninstall and destroy all copies of the Software.  The following additional terms also apply to Licensee's use of the Software.  

-	<br>

-	2.1    License Grant.  Subject to the terms and conditions of this Agreement, Adobe grants Licensee a non-exclusive, nontransferable license to (a) use the Software for the sole purpose of internally developing Developer Programs, (b) use the Software as part of Licensee's website for the sole purpose of compiling the Developer Programs that are distributed through the Licensee's website, (c) modify and reproduce Source Files for use as a component of Developer Programs that add Material Improvements to the Source Files, and (d) distribute Source Files in object code form and/or source code form only as a component of Developer Programs that add Material Improvements to the Source Files, provided that (1) such Developer Programs are designed to operate in connection with Adobe products, (2) Licensee distributes such object code and/or source code under the terms and conditions of an End User License Agreement, (3) Licensee includes a copyright notice reflecting the copyrigh
 t ownership of Developer in such Developer Programs, (4) Licensee shall be solely responsible to its customers for any update or support obligation or other liability which may arise from such distribution, (5) Licensee does not make any statements that its Developer Program is "certified," or that its performance is guaranteed, by Adobe, (6) Licensee does not use Adobe's name or trademarks to market its Developer Programs without written permission of Adobe, (7) Licensee does not delete or in any manner alter the copyright notices, trademarks, logos or related notices, or other proprietary rights notices of Adobe (and its licensors, if any) appearing on or within the Source Files and/or the Software, or any documentation relating to the Software, (8) Licensee causes any modified files to carry prominent notices stating that Licensee changed the files, and (9) Licensee does not use "mx", "mxml", "flex", "flash" or "adobe" in any new package or class names distributed with th
 e Source Files.  Any modified or merged portion of the Source Files is subject to this Agreement.

-	<br>

-	2.2    Restrictions.  

-	<br>

-	2.2.1  General Restrictions.  Except for the limited distribution rights as provided in Section 2.1 above with respect to Source Files, Licensee may not distribute, sell, sublicense, rent, loan, or lease the Software and/or any component thereof to any third party.  For the avoidance of doubt, Licensee shall not have a right to distribute any Software that are provided as executables and/or in object code form. Licensee also agrees not to add or delete any program files that would modify the functionality and/or appearance of other Adobe software and/or any component thereof.    

-	<br>

-	2.2.2  Development Restrictions.  Licensee agrees that Licensee will not use the Software to create, develop or use any program, software or service which (1) contains any viruses, Trojan horses, worms, time bombs, cancelbots or other computer programming routines that are intended to damage, detrimentally interfere with, surreptitiously intercept or expropriate any system, data or personal information; (2) when used in the manner in which it is intended, violates any material law, statute, ordinance or regulation (including without limitation the laws and regulations governing export control, unfair competition, antidiscrimination or false advertising); or (3) interferes with the operability of other Adobe or third-party programs or software.

-	<br>

-	2.2.3  Indemnification.  Licensee agrees to defend, indemnify, and hold Adobe and its suppliers harmless from and against any claims or lawsuits, including attorneys' reasonable fees, that arise or result from the use or distribution of Developer Programs, provided that Adobe gives Licensee prompt written notice of any such claim, tenders to Licensee the defense or settlement of such a claim at Licensee's expense, and cooperates with Licensee, at Licensee's expense, in defending or settling such claim. 

-	<br>

-	2.2.4  No Modifications, No Reverse Engineering. Licensee shall not modify, port, adapt or translate the Software. Licensee shall not reverse engineer, decompile, disassemble or otherwise attempt to discover the source code of the Software.  Notwithstanding the foregoing, decompiling the Software is permitted to the extent the laws of Licensee's jurisdiction give Licensee the right to do so to obtain information necessary to render the Software interoperable with other software; provided, however, that Licensee must first request such information from Adobe and Adobe may, in its discretion, either provide such information to Licensee or impose reasonable conditions, including a reasonable fee, on such use of the source code to ensure that Adobe's and its suppliers' proprietary rights in the source code for the Software are protected.

-	<br>

-	2.2.5  No Unbundling. The Software may include various applications, utilities and components, may support multiple platforms and languages or may be provided to Licensee on multiple media or in multiple copies. Nonetheless, the Software is designed and provided to Licensee as a single product to be used as a single product on Computers and platforms as permitted herein. Licensee is not required to use all component parts of the Software, but Licensee shall not unbundle the component parts of the Software for use on different Computers. Licensee shall not unbundle or repackage the Software for distribution, transfer or resale.

-	<br>

-	2.2.6  No Transfer. Licensee shall not sublicense, assign or transfer the Software or Licensee's rights in the Software, or authorize any portion of the Software to be copied onto or accessed from another individual's or entity's Computer except as may be explicitly provided in this Agreement.  Notwithstanding anything to the contrary in this Section 2.2.6, Licensee may transfer copies of the Software installed on one of Licensee's Computers to another one of Licensee's Computers provided that the resulting installation and use of the Software is in accordance with the terms of this Agreement and does not cause Licensee to exceed Licensee's right to use the Software under this Agreement.

-	<br>

-	2.2.7  Prohibited Use.  Except as expressly authorized under this Agreement, Licensee is prohibited from: (a) using the Software on behalf of third parties; (b) renting, leasing, lending or granting other rights in the Software including rights on a membership or subscription basis; and (c) providing use of the Software in a computer service business, third party outsourcing facility or service, service bureau arrangement, network, or time sharing basis.

-	<br>

-	2.2.8  Export Rules. Licensee agrees that the Software will not be shipped, transferred or exported into any country or used in any manner prohibited by the United States Export Administration Act or any other export laws, restrictions or regulations (collectively the "Export Laws"). In addition, if the Software is identified as an export controlled item under the Export Laws, Licensee represents and warrants that Licensee is not a citizen of, or located within, an embargoed or otherwise restricted nation (including Iran, Iraq, Syria, Sudan, Libya, Cuba and North Korea) and that Licensee is not otherwise prohibited under the Export Laws from receiving the Software.   All rights to install and use the Software are granted on condition that such rights are forfeited if Licensee fails to comply with the terms of this Agreement.

-	<br>

-	3.     Intellectual Property Rights. The Software and any copies that Licensee is authorized by Adobe to make are the intellectual property of and are owned by Adobe Systems Incorporated and its suppliers. The structure, organization and code of the Software are the valuable trade secrets and confidential information of Adobe Systems Incorporated and its suppliers. The Software is protected by copyright, including without limitation by United States Copyright Law, international treaty provisions and applicable laws in the country in which it is being used.  Except as expressly stated herein, this Agreement does not grant Licensee any intellectual property rights in the Software and all rights not expressly granted are reserved by Adobe.

-	<br>

-	4.     WARRANTY DISCLAIMER

-	EXCEPT FOR ANY WARRANTY, CONDITION, REPRESENTATION OR TERM TO THE EXTENT TO WHICH THE SAME CANNOT OR MAY NOT BE EXCLUDED OR LIMITED BY LAW APPLICABLE IN LICENSEE'S JURISDICTION, ADOBE, ITS AFFILIATES AND ITS SUPPLIERS PROVIDE THE SOFTWARE AS-IS AND WITH ALL FAULTS AND EXPRESSLY DISCLAIM ALL OTHER WARRANTIES, CONDITIONS, REPRESENTATIONS OR TERMS, EXPRESS OR IMPLIED, WHETHER BY STATUTE, COMMON LAW, CUSTOM, USAGE OR OTHERWISE AS TO ANY OTHER MATTERS, INCLUDING PERFORMANCE, SECURITY, NON-INFRINGEMENT OF THIRD PARTY RIGHTS, INTEGRATION, MERCHANTABILITY, QUIET ENJOYMENT, SATISFACTORY QUALITY OR FITNESS FOR ANY PARTICULAR PURPOSE.

-	<br>

-	5.     LIMITATION OF LIABILITY.	IN NO EVENT WILL ADOBE, ITS AFFILIATES OR ITS SUPPLIERS BE LIABLE TO LICENSEE FOR ANY LOSS, DAMAGES, CLAIMS OR COSTS WHATSOEVER INCLUDING ANY CONSEQUENTIAL, INDIRECT OR INCIDENTAL DAMAGES, ANY LOST PROFITS OR LOST SAVINGS, ANY DAMAGES RESULTING FROM BUSINESS INTERRUPTION, PERSONAL INJURY OR FAILURE TO MEET ANY DUTY OF CARE, OR CLAIMS BY A THIRD PARTY EVEN IF AN ADOBE REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSS, DAMAGES, CLAIMS OR COSTS.  THE FOREGOING LIMITATIONS AND EXCLUSIONS APPLY TO THE EXTENT PERMITTED BY APPLICABLE LAW IN LICENSEE'S JURISDICTION.  ADOBE'S AGGREGATE LIABILITY AND THAT OF ITS AFFILIATES AND SUPPLIERS UNDER OR IN CONNECTION WITH THIS AGREEMENT SHALL BE LIMITED TO THE AMOUNT PAID FOR THE SOFTWARE, IF ANY.  THIS LIMITATION WILL APPLY EVEN IN THE EVENT OF A FUNDAMENTAL OR MATERIAL BREACH OR A BREACH OF THE FUNDAMENTAL OR MATERIAL TERMS OF THIS AGREEMENT.  Nothing contained in this Agreement limits Adobe's 
 liability to Licensee in the event of death or personal injury resulting from Adobe's negligence or for the tort of deceit (fraud). Adobe is acting on behalf of its affiliates and suppliers for the purpose of disclaiming, excluding and limiting obligations, warranties and liability, but in no other respects and for no other purpose. For further information, please see the jurisdiction specific information at the end of this agreement, if any, or contact Adobe's Licensee Support Department.

-	<br>

-	6.     Governing Law. This Agreement, each transaction entered into hereunder, and all matters arising from or related to this Agreement (including its validity and interpretation), will be governed and enforced by and construed in accordance with the substantive laws in force in: (a) the State of California, if a license to the Software is purchased when Licensee is in the United States, Canada, or Mexico; or (b) Japan, if a license to the Software is purchased when Licensee is in Japan, China, Korea, or other Southeast Asian country where all official languages are written in either an ideographic script (e.g., hanzi, kanji, or hanja), and/or other script based upon or similar in structure to an ideographic script, such as hangul or kana; or (c) England, if a license to the Software is purchased when Licensee is in any other jurisdiction not described above. The respective courts of Santa Clara County, California when California law applies, Tokyo District Court in Japan,
  when Japanese law applies, and the competent courts of London, England, when the law of England applies, shall each have non-exclusive jurisdiction over all disputes relating to this Agreement. This Agreement will not be governed by the conflict of law rules of any jurisdiction or the United Nations Convention on Contracts for the International Sale of Goods, the application of which is expressly excluded.

-	<br>

-	7.     General Provisions. If any part of this Agreement is found void and unenforceable, it will not affect the validity of the balance of this Agreement, which shall remain valid and enforceable according to its terms.  Updates may be licensed to Licensee by Adobe with additional or different terms.  The English version of this Agreement shall be the version used when interpreting or construing this Agreement.  This is the entire agreement between Adobe and Licensee relating to the Software and it supersedes any prior representations, discussions, undertakings, communications or advertising relating to the Software.

-	<br>

-	8.     Notice to U.S. Government End Users.

-	<br>

-	8.1    Commercial Items.  The Software and Documentation are "Commercial Item(s)," as that term is defined at 48 C.F.R. Section 2.101, consisting of "Commercial Computer Software" and "Commercial Computer Software Documentation," as such terms are used in 48 C.F.R. Section 12.212 or 48 C.F.R. Section 227.7202, as applicable. Consistent with 48 C.F.R. Section 12.212 or 48 C.F.R. Sections 227.7202-1 through 227.7202-4, as applicable, the Commercial Computer Software and Commercial Computer Software Documentation are being licensed to U.S. Government end users (a) only as Commercial Items and (b) with only those rights as are granted to all other end users pursuant to the terms and conditions herein. Unpublished-rights reserved under the copyright laws of the United States. Adobe Systems Incorporated, 345 Park Avenue, San Jose, CA 95110-2704, USA.

-	<br>

-	8.2    U.S. Government Licensing of Adobe Technology. Licensee agrees that when licensing Adobe Software for acquisition by the U.S. Government, or any contractor therefore, Licensee will license consistent with the policies set forth in 48 C.F.R. Section 12.212 (for civilian agencies) and 48 C.F.R. Sections 227-7202-1 and 227-7202-4 (for the Department of Defense). For U.S. Government End Users, Adobe agrees to comply with all applicable equal opportunity laws including, if appropriate, the provisions of Executive Order 11246, as amended, Section 402 of the Vietnam Era Veterans Readjustment Assistance Act of 1974 (38 USC 4212), and Section 503 of the Rehabilitation Act of 1973, as amended, and the regulations at 41 CFR Parts 60-1 through 60-60, 60-250, and 60-741.  The affirmative action clause and regulations contained in the preceding sentence shall be incorporated by reference in this Agreement.

-	<br>

-	9.     Compliance with Licenses.  Adobe may, at its expense, and no more than once every twelve (12) months, appoint its own personnel or an independent third party to verify the number of copies and installations as well as usage of the Adobe software in use by Licensee.  Any such verification shall be conducted upon seven (7) business days notice, during regular business hours at Licensee's offices and shall not unreasonably interfere with Licensee's business activities.  Both Adobe and its auditors shall execute a commercially reasonable non-disclosure agreement with Licensee before proceeding with the verification.  If such verification shows that Licensee is using a greater number of copies of the Software than that legitimately licensed, or are deploying or using the Software in any way not permitted under this Agreement and which would require additional license fees, Licensee shall pay the applicable fees for such additional copies within thirty (30) days of invoice
  date, with such underpaid fees being the license fees as per Adobe's then-current, country specific, license fee list.  If Licensee is shown to have not complied fully with this Agreement, then Licensee shall pay any underpaid fees and Adobe's reasonable costs of conducting the verification.  Adobe may also pursue any other remedies it may have under the law or equity.

-	<br>

-	10.    Third-Party Beneficiary.  Licensee acknowledges and agrees that Adobe's licensors (and/or Adobe if Licensee obtained the Software from any party other than Adobe) are third party beneficiaries of this Agreement, with the right to enforce the obligations set forth herein with respect to the respective technology of such licensors and/or Adobe.

-	<br>

-	11.    Specific Provisions and Exceptions. This section sets forth specific provisions related to certain components of the Software as well as limited exceptions to the above terms and conditions. To the extent that any provision in this section is in conflict with any other term or condition in this agreement, this section will supersede such other term or condition.

-	<br>

-	11.1   Limitation of Liability for Users Residing in Germany and Austria.

-	<br>

-	11.1.1 If Licensee obtained the Software in Germany or Austria, and Licensee usually resides in such country, then Section 4 does not apply. Instead, subject to the provisions in Section 11.1.2, Adobe and its affiliates' statutory liability for damages will be limited as follows:  (i) Adobe and its affiliates will be liable only up to the amount of damages as typically foreseeable at the time of entering into the purchase agreement in respect of damages caused by a slightly negligent breach of a material contractual obligation and (ii) Adobe and its affiliates will not be liable for damages caused by a slightly negligent breach of a non-material contractual obligation.

-	<br>

-	11.1.2 The aforesaid limitation of liability will not apply to any mandatory statutory liability, in particular, to liability under the German Product Liability Act, liability for assuming a specific guarantee or liability for culpably caused personal injuries.

-	<br>

-	11.1.3 Licensee is required to take all reasonable measures to avoid and reduce damages, in particular to make back-up copies of the Software and Licensee's computer data subject to the provisions of this agreement.

-	<br>

-	If Licensee has any questions regarding this agreement or if Licensee wishes to request any information from Adobe please use the address and contact information included with this product to contact the Adobe office serving Licensee's jurisdiction.

-	<br>

-	Adobe is either a registered trademark or trademark of Adobe Systems Incorporated in the United States and/or other countries.

-	<br>

-	Adobe Flex Component Kit for Adobe Flash Software 04182007

-	<br>

-

-

+	
    Licensed to the Apache Software Foundation (ASF) under one or more

+	<br>

    contributor license agreements.  See the NOTICE file distributed with

+	<br>

    this work for additional information regarding copyright ownership.

+	<br>

    The ASF licenses this file to You under the Apache License, Version 2.0

+	<br>

    (the "License"); you may not use this file except in compliance with

+	<br>

    the License.  You may obtain a copy of the License at

+	<br>


+	<br>

    
      http://www.apache.org/licenses/LICENSE-2.0

+	<br>


+	<br>

    
    Unless required by applicable law or agreed to in writing, software

+	<br>

    distributed under the License is distributed on an "AS IS" BASIS,

+	<br>

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+	<br>

    See the License for the specific language governing permissions and

+	<br>

    limitations under the License.

+	<br>
 

 ]]></license-agreement>

   <ui-access><![CDATA[


Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/effects/easing/easing_readme.txt
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/effects/easing/easing_readme.txt?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/effects/easing/easing_readme.txt (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/effects/easing/easing_readme.txt Thu May 24 21:59:13 2012
@@ -1,3 +1,21 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
 
 ============================================================================================
  Easing Equations v2.0

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Color.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Color.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Color.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Color.pbk Thu May 24 21:59:13 2012
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
 <languageVersion : 1.0;>
 kernel Color
 <   namespace : "Flame";

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorBurn.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorBurn.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorBurn.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorBurn.pbk Thu May 24 21:59:13 2012
@@ -1,65 +1,149 @@
-<languageVersion : 1.0;>
-kernel ColorBurn
-<   namespace : "Flame";
-    vendor : "Adobe";
-    version : 1;
-    description : "ColorBurn blend mode";
->
-{
-    input image4 dst;
-    input image4 src;
-    output pixel4 result;
-
-    void
-    evaluatePixel()
-    {
-        pixel4 a = sampleNearest(dst,outCoord()); //cb
-        pixel4 b = sampleNearest(src,outCoord()); //cs
-        
-        // remove premultiplied (srcCP/srcA, dstCP/dstA)
-        pixel3 cb = a.rgb;
-        pixel3 cs = b.rgb;
-        if (a.a > 0.0) {
-            cb.rgb = a.rgb / a.a;
-        }
-        if (b.a > 0.0) {
-            cs.rgb = b.rgb / b.a;
-        }
-        
-        // dstA' = (1-srcA)*dstA + srcA
-        result.a = (1.0-b.a)*a.a + b.a;
-        
-        // temp for Blend(srcCP/srcA, dstCP/dstA)
-        pixel3 blendResult;
-
-        // = 1, if cb = 1 (*** this case is AE/PS and AGM only, not PDF spec)
-        // = 0, if (1 � cb) >= cs
-        // = (1 � cb) / cs, otherwise
-        if (cb.r == 1.0) {
-            blendResult.r = 1.0;
-        } else if ((1.0 - cb.r) >= cs.r) {
-            blendResult.r = 0.0;
-        } else {
-            blendResult.r = 1.0 - (1.0 - cb.r) / cs.r;
-        }
-        
-        if (cb.g == 1.0) {
-            blendResult.g = 1.0;
-        } else if ((1.0 - cb.g) >= cs.g) {
-            blendResult.g = 0.0;
-        } else {
-            blendResult.g = 1.0 - (1.0 - cb.g) / cs.g;
-        }
-        
-        if (cb.b == 1.0) {
-            blendResult.b = 1.0;
-        } else if ((1.0 - cb.b) >= cs.b) {
-            blendResult.b = 0.0;
-        } else {
-            blendResult.b = 1.0 - (1.0 - cb.b) / cs.b;
-        }
-        
-        // dstCP' = (1-srcA)*dstCP + (1-dstA)*srcCP + srcA*dstA*Blend(srcCP/srcA, dstCP/dstA)
-        result.rgb = (1.0-b.a)*a.rgb + (1.0-a.a)*b.rgb + b.a*a.a*blendResult.rgb;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+<languageVersion : 1.0;>
+
+kernel ColorBurn
+
+<   namespace : "Flame";
+
+    vendor : "Adobe";
+
+    version : 1;
+
+    description : "ColorBurn blend mode";
+
+>
+
+{
+
+    input image4 dst;
+
+    input image4 src;
+
+    output pixel4 result;
+
+
+
+    void
+
+    evaluatePixel()
+
+    {
+
+        pixel4 a = sampleNearest(dst,outCoord()); //cb
+
+        pixel4 b = sampleNearest(src,outCoord()); //cs
+
+        
+
+        // remove premultiplied (srcCP/srcA, dstCP/dstA)
+
+        pixel3 cb = a.rgb;
+
+        pixel3 cs = b.rgb;
+
+        if (a.a > 0.0) {
+
+            cb.rgb = a.rgb / a.a;
+
+        }
+
+        if (b.a > 0.0) {
+
+            cs.rgb = b.rgb / b.a;
+
+        }
+
+        
+
+        // dstA' = (1-srcA)*dstA + srcA
+
+        result.a = (1.0-b.a)*a.a + b.a;
+
+        
+
+        // temp for Blend(srcCP/srcA, dstCP/dstA)
+
+        pixel3 blendResult;
+
+
+
+        // = 1, if cb = 1 (*** this case is AE/PS and AGM only, not PDF spec)
+
+        // = 0, if (1 � cb) >= cs
+
+        // = (1 � cb) / cs, otherwise
+
+        if (cb.r == 1.0) {
+
+            blendResult.r = 1.0;
+
+        } else if ((1.0 - cb.r) >= cs.r) {
+
+            blendResult.r = 0.0;
+
+        } else {
+
+            blendResult.r = 1.0 - (1.0 - cb.r) / cs.r;
+
+        }
+
+        
+
+        if (cb.g == 1.0) {
+
+            blendResult.g = 1.0;
+
+        } else if ((1.0 - cb.g) >= cs.g) {
+
+            blendResult.g = 0.0;
+
+        } else {
+
+            blendResult.g = 1.0 - (1.0 - cb.g) / cs.g;
+
+        }
+
+        
+
+        if (cb.b == 1.0) {
+
+            blendResult.b = 1.0;
+
+        } else if ((1.0 - cb.b) >= cs.b) {
+
+            blendResult.b = 0.0;
+
+        } else {
+
+            blendResult.b = 1.0 - (1.0 - cb.b) / cs.b;
+
+        }
+
+        
+
+        // dstCP' = (1-srcA)*dstCP + (1-dstA)*srcCP + srcA*dstA*Blend(srcCP/srcA, dstCP/dstA)
+
+        result.rgb = (1.0-b.a)*a.rgb + (1.0-a.a)*b.rgb + b.a*a.a*blendResult.rgb;
+
+    }
+
+}
+

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorDodge.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorDodge.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorDodge.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/ColorDodge.pbk Thu May 24 21:59:13 2012
@@ -1,66 +1,151 @@
-<languageVersion : 1.0;>
-kernel ColorDodge
-<   namespace : "Flame";
-    vendor : "Adobe";
-    version : 1;
-    description : "ColorDodge blend mode";
->
-{
-    input image4 dst;
-    input image4 src;
-    output pixel4 result;
-
-    void
-    evaluatePixel()
-    {
-        pixel4 a = sampleNearest(dst,outCoord()); // cb
-        pixel4 b = sampleNearest(src,outCoord()); // cs
-        
-        // remove premultiplied (srcCP/srcA, dstCP/dstA)
-        pixel3 cb = a.rgb;
-        pixel3 cs = b.rgb;
-        if (a.a > 0.0) {
-            cb.rgb = a.rgb / a.a;
-        }
-        if (b.a > 0.0) {
-            cs.rgb = b.rgb / b.a;
-        }
-        
-        // dstA' = (1-srcA)*dstA + srcA
-        result.a = (1.0-b.a)*a.a + b.a;
-        
-        // temp for Blend(srcCP/srcA, dstCP/dstA)
-        pixel3 blendResult;
-        
-        // = 0, if cb = 0 (*** this case is AE/PS and AGM only, not PDF spec)
-        // = 1, if cb >= (1 -cs)
-        // = cb / (1 -cs), otherwise
-        
-        if (cb.r == 0.0) {
-            blendResult.r = 0.0;
-        } else if ( cb.r >= (1.0 - cs.r)) {
-            blendResult.r = 1.0;
-        } else {
-            blendResult.r = cb.r / (1.0 - cs.r);
-        }
-        
-        if (cb.g == 0.0) {
-            blendResult.g = 0.0;
-        } else if ( cb.g >= (1.0 - cs.g)) {
-            blendResult.g = 1.0;
-        } else {
-            blendResult.g = cb.g / (1.0 - cs.g);
-        }
-        
-        if (cb.b == 0.0) {
-            blendResult.b = 0.0;
-        } else if ( cb.b >= (1.0 - cs.b)) {
-            blendResult.b = 1.0;
-        } else {
-            blendResult.b = cb.b / (1.0 - cs.b);
-        }
-                
-        // dstCP' = (1-srcA)*dstCP + (1-dstA)*srcCP + srcA*dstA*Blend(srcCP/srcA, dstCP/dstA)
-        result.rgb = (1.0-b.a)*a.rgb + (1.0-a.a)*b.rgb + b.a*a.a*blendResult.rgb;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+<languageVersion : 1.0;>
+
+kernel ColorDodge
+
+<   namespace : "Flame";
+
+    vendor : "Adobe";
+
+    version : 1;
+
+    description : "ColorDodge blend mode";
+
+>
+
+{
+
+    input image4 dst;
+
+    input image4 src;
+
+    output pixel4 result;
+
+
+
+    void
+
+    evaluatePixel()
+
+    {
+
+        pixel4 a = sampleNearest(dst,outCoord()); // cb
+
+        pixel4 b = sampleNearest(src,outCoord()); // cs
+
+        
+
+        // remove premultiplied (srcCP/srcA, dstCP/dstA)
+
+        pixel3 cb = a.rgb;
+
+        pixel3 cs = b.rgb;
+
+        if (a.a > 0.0) {
+
+            cb.rgb = a.rgb / a.a;
+
+        }
+
+        if (b.a > 0.0) {
+
+            cs.rgb = b.rgb / b.a;
+
+        }
+
+        
+
+        // dstA' = (1-srcA)*dstA + srcA
+
+        result.a = (1.0-b.a)*a.a + b.a;
+
+        
+
+        // temp for Blend(srcCP/srcA, dstCP/dstA)
+
+        pixel3 blendResult;
+
+        
+
+        // = 0, if cb = 0 (*** this case is AE/PS and AGM only, not PDF spec)
+
+        // = 1, if cb >= (1 -cs)
+
+        // = cb / (1 -cs), otherwise
+
+        
+
+        if (cb.r == 0.0) {
+
+            blendResult.r = 0.0;
+
+        } else if ( cb.r >= (1.0 - cs.r)) {
+
+            blendResult.r = 1.0;
+
+        } else {
+
+            blendResult.r = cb.r / (1.0 - cs.r);
+
+        }
+
+        
+
+        if (cb.g == 0.0) {
+
+            blendResult.g = 0.0;
+
+        } else if ( cb.g >= (1.0 - cs.g)) {
+
+            blendResult.g = 1.0;
+
+        } else {
+
+            blendResult.g = cb.g / (1.0 - cs.g);
+
+        }
+
+        
+
+        if (cb.b == 0.0) {
+
+            blendResult.b = 0.0;
+
+        } else if ( cb.b >= (1.0 - cs.b)) {
+
+            blendResult.b = 1.0;
+
+        } else {
+
+            blendResult.b = cb.b / (1.0 - cs.b);
+
+        }
+
+                
+
+        // dstCP' = (1-srcA)*dstCP + (1-dstA)*srcCP + srcA*dstA*Blend(srcCP/srcA, dstCP/dstA)
+
+        result.rgb = (1.0-b.a)*a.rgb + (1.0-a.a)*b.rgb + b.a*a.a*blendResult.rgb;
+
+    }
+
+}
+

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Exclusion.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Exclusion.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Exclusion.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Exclusion.pbk Thu May 24 21:59:13 2012
@@ -1,43 +1,105 @@
-<languageVersion : 1.0;>
-kernel Exclusion
-<   namespace : "Flame";
-    vendor : "Adobe";
-    version : 1;
-    description : "Exclusion blend mode";
->
-{
-    input image4 dst;
-    input image4 src;
-    output pixel4 result;
-
-    void
-    evaluatePixel()
-    {
-        pixel4 a = sampleNearest(dst,outCoord()); // cb
-        pixel4 b = sampleNearest(src,outCoord()); // cs
-        
-        // remove premultiplied (srcCP/srcA, dstCP/dstA)
-        //pixel3 cb, cs;
-        pixel3 cb = a.rgb;
-        pixel3 cs = b.rgb;
-
-        if (a.a > 0.0) {
-            cb.rgb = a.rgb / a.a;
-        }
-        if (b.a > 0.0) {
-            cs.rgb = b.rgb / b.a;
-        }
-        
-        // dstA' = (1-srcA)*dstA + srcA
-        result.a = (1.0-b.a)*a.a + b.a;
-        
-        // temp for Blend(srcCP/srcA, dstCP/dstA)
-        float3 blendResult;
-        
-        // cb + cs � 2*cs*cb
-        blendResult.rgb = cb.rgb + cs.rgb - 2.0*cs.rgb*cb.rgb;
-        
-        // dstCP' = (1-srcA)*dstCP + (1-dstA)*srcCP + srcA*dstA*Blend(srcCP/srcA, dstCP/dstA)
-        result.rgb = ((1.0-b.a)*a.rgb) + ((1.0-a.a)*b.rgb) + b.a*a.a*blendResult.rgb;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+<languageVersion : 1.0;>
+
+kernel Exclusion
+
+<   namespace : "Flame";
+
+    vendor : "Adobe";
+
+    version : 1;
+
+    description : "Exclusion blend mode";
+
+>
+
+{
+
+    input image4 dst;
+
+    input image4 src;
+
+    output pixel4 result;
+
+
+
+    void
+
+    evaluatePixel()
+
+    {
+
+        pixel4 a = sampleNearest(dst,outCoord()); // cb
+
+        pixel4 b = sampleNearest(src,outCoord()); // cs
+
+        
+
+        // remove premultiplied (srcCP/srcA, dstCP/dstA)
+
+        //pixel3 cb, cs;
+
+        pixel3 cb = a.rgb;
+
+        pixel3 cs = b.rgb;
+
+
+
+        if (a.a > 0.0) {
+
+            cb.rgb = a.rgb / a.a;
+
+        }
+
+        if (b.a > 0.0) {
+
+            cs.rgb = b.rgb / b.a;
+
+        }
+
+        
+
+        // dstA' = (1-srcA)*dstA + srcA
+
+        result.a = (1.0-b.a)*a.a + b.a;
+
+        
+
+        // temp for Blend(srcCP/srcA, dstCP/dstA)
+
+        float3 blendResult;
+
+        
+
+        // cb + cs � 2*cs*cb
+
+        blendResult.rgb = cb.rgb + cs.rgb - 2.0*cs.rgb*cb.rgb;
+
+        
+
+        // dstCP' = (1-srcA)*dstCP + (1-dstA)*srcCP + srcA*dstA*Blend(srcCP/srcA, dstCP/dstA)
+
+        result.rgb = ((1.0-b.a)*a.rgb) + ((1.0-a.a)*b.rgb) + b.a*a.a*blendResult.rgb;
+
+    }
+
+}
+

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Hue.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Hue.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Hue.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Hue.pbk Thu May 24 21:59:13 2012
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
 <languageVersion : 1.0;>
 kernel Hue
 <   namespace : "Flame";

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Luminosity.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Luminosity.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Luminosity.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Luminosity.pbk Thu May 24 21:59:13 2012
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
 <languageVersion : 1.0;>
 kernel Luminosity
 <   namespace : "Flame";

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/LuminosityMaskFilter.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/LuminosityMaskFilter.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/LuminosityMaskFilter.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/LuminosityMaskFilter.pbk Thu May 24 21:59:13 2012
@@ -1,57 +1,133 @@
-<languageVersion : 1.0;>
-kernel LuminosityMaskFilter
-<   namespace : "Flame";
-    vendor : "Adobe";
-    version : 0;
-    description : "Luminosity Mask filter - Flex SDK";
->
-{
-    parameter int mode <
-        minValue:int(0);
-        maxValue:int(3);
-        defaultValue:int(0);
-    >;
-
-    input image4 mask;
-    output pixel4 result;
-
-    void
-    evaluatePixel()
-    {
-        result = sampleNearest(mask, outCoord());
-
-        // AI Luminosity mask calculation
-        // input is artwork mask argb
-        // Flex will only use alpha channel in an "alpha" mask
-	  // calculate new alpha channel using AI luminosity calculation
-
-        // invert option is mode bit 1
-        // clip option is mode bit 2
-
-        // if (clip != invert) background = 0 else background = 1
-        // luminosity = 0.3*red + 0.59*green + 0.11*blue
-        // output alpha = alpha*luminosity + (1-alpha)*background;
-        // if (invert) output alpha = 1 - output alpha
-
-        // calculate alpha*luminosity for result argb
-        // in flash, the mask artwork is premultiplied
-        // so we use luminosity and not alpha*luminosity
-        float alphaLum = (0.3 * result.r) + (0.59 * result.g) + (0.11 * result.b);
-        
-        // mode 0 - clip 0, invert 0, background 1 = alpha*luminosity + (1-alpha)*1
-        if (mode == 0)
-            result.a = 1.0 - result.a + alphaLum;
-        
-        // mode 1 - clip 0, invert 1, background 0 = 1 - (alpha*luminosity + (1-alpha)*0)
-        if (mode == 1)
-           result.a = 1.0 - alphaLum;
-        
-        // mode 2 - clip 1, invert 0, background 0 = alpha*luminosity + (1-alpha)*0
-        if (mode == 2) 
-            result.a = alphaLum;
-        
-        // mode 3 - clip 1, invert 1, background 1 = 1 - (alpha*luminosity + (1-alpha)*1)
-        if (mode == 3)
-           result.a = result.a - alphaLum;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+<languageVersion : 1.0;>
+
+kernel LuminosityMaskFilter
+
+<   namespace : "Flame";
+
+    vendor : "Adobe";
+
+    version : 0;
+
+    description : "Luminosity Mask filter - Flex SDK";
+
+>
+
+{
+
+    parameter int mode <
+
+        minValue:int(0);
+
+        maxValue:int(3);
+
+        defaultValue:int(0);
+
+    >;
+
+
+
+    input image4 mask;
+
+    output pixel4 result;
+
+
+
+    void
+
+    evaluatePixel()
+
+    {
+
+        result = sampleNearest(mask, outCoord());
+
+
+
+        // AI Luminosity mask calculation
+
+        // input is artwork mask argb
+
+        // Flex will only use alpha channel in an "alpha" mask
+
+	  // calculate new alpha channel using AI luminosity calculation
+
+
+
+        // invert option is mode bit 1
+
+        // clip option is mode bit 2
+
+
+
+        // if (clip != invert) background = 0 else background = 1
+
+        // luminosity = 0.3*red + 0.59*green + 0.11*blue
+
+        // output alpha = alpha*luminosity + (1-alpha)*background;
+
+        // if (invert) output alpha = 1 - output alpha
+
+
+
+        // calculate alpha*luminosity for result argb
+
+        // in flash, the mask artwork is premultiplied
+
+        // so we use luminosity and not alpha*luminosity
+
+        float alphaLum = (0.3 * result.r) + (0.59 * result.g) + (0.11 * result.b);
+
+        
+
+        // mode 0 - clip 0, invert 0, background 1 = alpha*luminosity + (1-alpha)*1
+
+        if (mode == 0)
+
+            result.a = 1.0 - result.a + alphaLum;
+
+        
+
+        // mode 1 - clip 0, invert 1, background 0 = 1 - (alpha*luminosity + (1-alpha)*0)
+
+        if (mode == 1)
+
+           result.a = 1.0 - alphaLum;
+
+        
+
+        // mode 2 - clip 1, invert 0, background 0 = alpha*luminosity + (1-alpha)*0
+
+        if (mode == 2) 
+
+            result.a = alphaLum;
+
+        
+
+        // mode 3 - clip 1, invert 1, background 1 = 1 - (alpha*luminosity + (1-alpha)*1)
+
+        if (mode == 3)
+
+           result.a = result.a - alphaLum;
+
+    }
+
+}
+

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Saturation.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Saturation.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Saturation.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/Saturation.pbk Thu May 24 21:59:13 2012
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
 <languageVersion : 1.0;>
 kernel Saturation
 <   namespace : "Flame";

Modified: incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/SoftLight.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/SoftLight.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/SoftLight.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/framework/src/mx/graphics/shaderClasses/SoftLight.pbk Thu May 24 21:59:13 2012
@@ -1,90 +1,199 @@
-<languageVersion : 1.0;>
-kernel SoftLight
-<   namespace : "Flame";
-    vendor : "Adobe";
-    version : 1;
-    description : "SoftLight blend mode";
->
-{
-    input image4 dst;
-    input image4 src;
-    output pixel4 result;
-
-    void
-    evaluatePixel()
-    {
-        pixel4 a = sampleNearest(dst,outCoord()); // cb
-        pixel4 b = sampleNearest(src,outCoord()); // cs
-        
-        // remove premultiplied (srcCP/srcA, dstCP/dstA)
-        pixel3 cb = a.rgb;
-        pixel3 cs = b.rgb;
-        if (a.a > 0.0) {
-            cb.rgb = a.rgb / a.a;
-        }
-        if (b.a > 0.0) {
-            cs.rgb = b.rgb / b.a;
-        }
-        
-        // dstA' = (1-srcA)*dstA + srcA
-        result.a = (1.0-b.a)*a.a + b.a;
-        
-        // B(cs,cb) = cb � (1 � 2*cs)*cb*(1-cb), if (cs <= 0.5)
-        //          = cb + (2*cs � 1)*(D(cb) � cb), otherwise
-        
-        float3 blendResult;
-
-        // red
-        if (cs.r <= 0.5) {
-            blendResult.r = cb.r - (1.0 - clamp(2.0*cs.r,0.0,1.0))*cb.r*(1.0-cb.r);
-        } else {
-            // this could be a helper function, but bytecode doesn't support this
-            // = ((16*x � 12)*x +4)*x, if x <= 0.25
-            // = x**0.5, otherwise
-            float dcb;
-            if (cb.r <= 0.25) {
-                dcb = ((16.0*cb.r - 12.0) *4.0)*cb.r;
-            } else {
-                dcb = sqrt(cb.r);
-            }
-            
-            blendResult.r = cb.r + (2.0*cs.r - 1.0)*(dcb - cb.r);
-        }
-
-        // green
-        if (cs.g <= 0.5) {
-            blendResult.g = cb.g - (1.0 - 2.0*cs.g)*cb.g*(1.0-cb.g);
-        } else {
-            // = ((16*x � 12)*x +4)*x, if x <= 0.25
-            // = x**0.5, otherwise
-            float dcb;
-            if (cb.g <= 0.25) {
-                dcb = ((16.0*cb.g - 12.0) *4.0)*cb.g;
-            } else {
-                dcb = sqrt(cb.g);
-            }
-            
-            blendResult.g = cb.g + (2.0*cs.g - 1.0)*(dcb - cb.g);
-        }
-
-        // blue
-        if (cs.b <= 0.5) {
-            blendResult.b = cb.b - (1.0 - 2.0*cs.b)*cb.b*(1.0-cb.b);
-        } else {
-            // = ((16*x � 12)*x +4)*x, if x <= 0.25
-            // = x**0.5, otherwise
-            float dcb;
-            if (cb.b <= 0.25) {
-                dcb = ((16.0*cb.b - 12.0) *4.0)*cb.b;
-            } else {
-                dcb = sqrt(cb.b);
-            }
-            
-            blendResult.b = cb.b + (2.0*cs.b - 1.0)*(dcb - cb.b);
-        }
-        
-        
-        // dstCP' = (1-srcA)*dstCP + (1-dstA)*srcCP + srcA*dstA*Blend(srcCP/srcA, dstCP/dstA)
-        result.rgb = (1.0-b.a)*a.rgb + (1.0-a.a)*b.rgb + b.a*a.a*blendResult.rgb;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+<languageVersion : 1.0;>
+
+kernel SoftLight
+
+<   namespace : "Flame";
+
+    vendor : "Adobe";
+
+    version : 1;
+
+    description : "SoftLight blend mode";
+
+>
+
+{
+
+    input image4 dst;
+
+    input image4 src;
+
+    output pixel4 result;
+
+
+
+    void
+
+    evaluatePixel()
+
+    {
+
+        pixel4 a = sampleNearest(dst,outCoord()); // cb
+
+        pixel4 b = sampleNearest(src,outCoord()); // cs
+
+        
+
+        // remove premultiplied (srcCP/srcA, dstCP/dstA)
+
+        pixel3 cb = a.rgb;
+
+        pixel3 cs = b.rgb;
+
+        if (a.a > 0.0) {
+
+            cb.rgb = a.rgb / a.a;
+
+        }
+
+        if (b.a > 0.0) {
+
+            cs.rgb = b.rgb / b.a;
+
+        }
+
+        
+
+        // dstA' = (1-srcA)*dstA + srcA
+
+        result.a = (1.0-b.a)*a.a + b.a;
+
+        
+
+        // B(cs,cb) = cb � (1 � 2*cs)*cb*(1-cb), if (cs <= 0.5)
+
+        //          = cb + (2*cs � 1)*(D(cb) � cb), otherwise
+
+        
+
+        float3 blendResult;
+
+
+
+        // red
+
+        if (cs.r <= 0.5) {
+
+            blendResult.r = cb.r - (1.0 - clamp(2.0*cs.r,0.0,1.0))*cb.r*(1.0-cb.r);
+
+        } else {
+
+            // this could be a helper function, but bytecode doesn't support this
+
+            // = ((16*x � 12)*x +4)*x, if x <= 0.25
+
+            // = x**0.5, otherwise
+
+            float dcb;
+
+            if (cb.r <= 0.25) {
+
+                dcb = ((16.0*cb.r - 12.0) *4.0)*cb.r;
+
+            } else {
+
+                dcb = sqrt(cb.r);
+
+            }
+
+            
+
+            blendResult.r = cb.r + (2.0*cs.r - 1.0)*(dcb - cb.r);
+
+        }
+
+
+
+        // green
+
+        if (cs.g <= 0.5) {
+
+            blendResult.g = cb.g - (1.0 - 2.0*cs.g)*cb.g*(1.0-cb.g);
+
+        } else {
+
+            // = ((16*x � 12)*x +4)*x, if x <= 0.25
+
+            // = x**0.5, otherwise
+
+            float dcb;
+
+            if (cb.g <= 0.25) {
+
+                dcb = ((16.0*cb.g - 12.0) *4.0)*cb.g;
+
+            } else {
+
+                dcb = sqrt(cb.g);
+
+            }
+
+            
+
+            blendResult.g = cb.g + (2.0*cs.g - 1.0)*(dcb - cb.g);
+
+        }
+
+
+
+        // blue
+
+        if (cs.b <= 0.5) {
+
+            blendResult.b = cb.b - (1.0 - 2.0*cs.b)*cb.b*(1.0-cb.b);
+
+        } else {
+
+            // = ((16*x � 12)*x +4)*x, if x <= 0.25
+
+            // = x**0.5, otherwise
+
+            float dcb;
+
+            if (cb.b <= 0.25) {
+
+                dcb = ((16.0*cb.b - 12.0) *4.0)*cb.b;
+
+            } else {
+
+                dcb = sqrt(cb.b);
+
+            }
+
+            
+
+            blendResult.b = cb.b + (2.0*cs.b - 1.0)*(dcb - cb.b);
+
+        }
+
+        
+
+        
+
+        // dstCP' = (1-srcA)*dstCP + (1-dstA)*srcCP + srcA*dstA*Blend(srcCP/srcA, dstCP/dstA)
+
+        result.rgb = (1.0-b.a)*a.rgb + (1.0-a.a)*b.rgb + b.a*a.a*blendResult.rgb;
+
+    }
+
+}
+

Modified: incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/CrossFade.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/CrossFade.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/CrossFade.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/CrossFade.pbk Thu May 24 21:59:13 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 <languageVersion : 1.0;>
 
 kernel Crossfade

Modified: incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeDown.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeDown.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeDown.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeDown.pbk Thu May 24 21:59:13 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 <languageVersion : 1.0;>
 kernel WipeDown
 <   namespace : "flex";

Modified: incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeLeft.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeLeft.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeLeft.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeLeft.pbk Thu May 24 21:59:13 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 <languageVersion : 1.0;>
 kernel WipeLeft
 <   namespace : "flex";

Modified: incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeRight.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeRight.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeRight.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeRight.pbk Thu May 24 21:59:13 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 <languageVersion : 1.0;>
 kernel WipeRight
 <   namespace : "flex";

Modified: incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeUp.pbk
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeUp.pbk?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeUp.pbk (original)
+++ incubator/flex/trunk/frameworks/projects/spark/src/spark/effects/WipeUp.pbk Thu May 24 21:59:13 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 <languageVersion : 1.0;>
 kernel WipeUp
 <   namespace : "flex";

Modified: incubator/flex/trunk/modules/antTasks/SPEC
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/antTasks/SPEC?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/modules/antTasks/SPEC (original)
+++ incubator/flex/trunk/modules/antTasks/SPEC Thu May 24 21:59:13 2012
@@ -1,3 +1,22 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
 =1= Introduction
 
 FlexTasks is an automated build tool for Flex application

Modified: incubator/flex/trunk/modules/antTasks/flexTasks-internal.tasks
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/antTasks/flexTasks-internal.tasks?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/modules/antTasks/flexTasks-internal.tasks (original)
+++ incubator/flex/trunk/modules/antTasks/flexTasks-internal.tasks Thu May 24 21:59:13 2012
@@ -1,3 +1,22 @@
+################################################################################
+##
+##  Licensed to the Apache Software Foundation (ASF) under one or more
+##  contributor license agreements.  See the NOTICE file distributed with
+##  this work for additional information regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##
+################################################################################
+
 mxmlc=flex.ant.MxmlcTask
 compc=flex.ant.CompcTask
 asc=flex.ant.AscTask

Modified: incubator/flex/trunk/modules/antTasks/flexTasks.tasks
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/antTasks/flexTasks.tasks?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/modules/antTasks/flexTasks.tasks (original)
+++ incubator/flex/trunk/modules/antTasks/flexTasks.tasks Thu May 24 21:59:13 2012
@@ -1,3 +1,22 @@
+################################################################################
+##
+##  Licensed to the Apache Software Foundation (ASF) under one or more
+##  contributor license agreements.  See the NOTICE file distributed with
+##  this work for additional information regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##
+################################################################################
+
 mxmlc=flex.ant.MxmlcTask
 compc=flex.ant.CompcTask
 html-wrapper=flex.ant.HtmlWrapperTask

Modified: incubator/flex/trunk/modules/compiler/src/java/flash/svg/SpriteTranscoder.java
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/compiler/src/java/flash/svg/SpriteTranscoder.java?rev=1342455&r1=1342454&r2=1342455&view=diff
==============================================================================
--- incubator/flex/trunk/modules/compiler/src/java/flash/svg/SpriteTranscoder.java (original)
+++ incubator/flex/trunk/modules/compiler/src/java/flash/svg/SpriteTranscoder.java Thu May 24 21:59:13 2012
@@ -1,12 +1,23 @@
 /* this file based on Batik's ImageTranscoder class, which is ... */
 
-/* ***************************************************************************
- * Copyright (C) The Apache Software Foundation. All rights reserved.        *
- * ------------------------------------------------------------------------- *
- * This software is published under the terms of the Apache Software License *
- * version 1.1, a copy of which has been included with this distribution in  *
- * the LICENSE file.                                                         *
- *****************************************************************************/
+/*
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
 package flash.svg;
 



Mime
View raw message