Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openexr/patches/001-makePreview.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 29 Aug 2012 11:05:56 -0700
changeset 957 255465c5756f
parent 147 5af6875cbf70
permissions -rw-r--r--
Close of build 04.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
147
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
*** exrmakepreview/makePreview.cpp	2009-08-31 10:52:16.587024739 -0700
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
--- exrmakepreview/makePreview.cpp	2009-08-31 10:52:18.578018655 -0700
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
***************
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
*** 78,84 ****
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
      // at 0.0, 0.0, and 5.0 respectively.
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
      //
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
!     float x = max (0.f, h * m);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
      if (x > 1)
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
  	x = 1 + knee (x - 1, 0.184874f);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
--- 78,84 ----
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
      // at 0.0, 0.0, and 5.0 respectively.
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
      //
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
!     float x = max (0.f, (float)(h * m));
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
      if (x > 1)
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
  	x = 1 + knee (x - 1, 0.184874f);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
***************
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
*** 132,138 ****
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
  	    preview.r = gamma (pixel.r, m);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
  	    preview.g = gamma (pixel.g, m);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
  	    preview.b = gamma (pixel.b, m);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
! 	    preview.a = int (clamp (pixel.a * 255.f, 0.f, 255.f) + .5f);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
  	}
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
      }
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
  }
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
--- 132,138 ----
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
  	    preview.r = gamma (pixel.r, m);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
  	    preview.g = gamma (pixel.g, m);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
  	    preview.b = gamma (pixel.b, m);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
! 	    preview.a = int (clamp ((double)(pixel.a * 255.f), (double)0.f, (double)255.f) + .5f);
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
  	}
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
      }
5af6875cbf70 7008450 CVE-2009-1720 CVE-2009-1721 upgrade openexr
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
 
  }
upstream/oracle/userland-gate