rpms/openoffice.org/devel openoffice.org-3.2.0.oooXXXXX.canvas.fixcolorspace.patch, NONE, 1.1 openoffice.org.spec, 1.2079, 1.2080

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3104/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.oooXXXXX.canvas.fixcolorspace.patch 
Log Message:
Resolves: rhbz#540231 add openoffice.org-3.2.0.oooXXXXX.canvas.fixcolorspace.patch

openoffice.org-3.2.0.oooXXXXX.canvas.fixcolorspace.patch:
 cairo_canvashelper.cxx |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE openoffice.org-3.2.0.oooXXXXX.canvas.fixcolorspace.patch ---
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 3b3571a..15245f4 100644
--- canvas/source/cairo/cairo_canvashelper.cxx
+++ canvas/source/cairo/cairo_canvashelper.cxx
@@ -1640,12 +1640,12 @@ namespace cairocanvas
                 rendering::RGBColor* pOut( aRes.getArray() );
                 for( sal_Size i=0; i<nLen; i+=4 )
                 {
-                    const sal_Int8 nAlpha(pIn[3]);
-                    if( nAlpha )
+                    const double fAlpha((sal_uInt8)pIn[3]);
+                    if( fAlpha )
                         *pOut++ = rendering::RGBColor(
-                            vcl::unotools::toDoubleColor(pIn[2]/nAlpha),
-                            vcl::unotools::toDoubleColor(pIn[1]/nAlpha),
-                            vcl::unotools::toDoubleColor(pIn[0]/nAlpha));
+                            pIn[2]/fAlpha,
+                            pIn[1]/fAlpha,
+                            pIn[0]/fAlpha);
                     else
                         *pOut++ = rendering::RGBColor(0,0,0);
                     pIn += 4;
@@ -1665,13 +1665,13 @@ namespace cairocanvas
                 rendering::ARGBColor* pOut( aRes.getArray() );
                 for( sal_Size i=0; i<nLen; i+=4 )
                 {
-                    const sal_Int8 nAlpha(pIn[3]);
-                    if( nAlpha )
+                    const double fAlpha((sal_uInt8)pIn[3]);
+                    if( fAlpha )
                         *pOut++ = rendering::ARGBColor(
-                            vcl::unotools::toDoubleColor(nAlpha),
-                            vcl::unotools::toDoubleColor(pIn[2]/nAlpha),
-                            vcl::unotools::toDoubleColor(pIn[1]/nAlpha),
-                            vcl::unotools::toDoubleColor(pIn[0]/nAlpha));
+                            fAlpha/255.0,
+                            pIn[2]/fAlpha,
+                            pIn[1]/fAlpha,
+                            pIn[0]/fAlpha);
                     else
                         *pOut++ = rendering::ARGBColor(0,0,0,0);
                     pIn += 4;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2079
retrieving revision 1.2080
diff -u -p -r1.2079 -r1.2080
--- openoffice.org.spec	23 Nov 2009 09:03:25 -0000	1.2079
+++ openoffice.org.spec	23 Nov 2009 10:49:37 -0000	1.2080
@@ -131,6 +131,7 @@ Patch53: workspace.ause109.patch
 Patch54: openoffice.org-3.2.0.oooxxxxx.fixdbcheck.patch
 Patch55: workspace.srb1.patch
 Patch56: openoffice.org-3.1.1.ooo107131.impress.tabledrag.crash
+Patch57: openoffice.org-3.2.0.oooXXXXX.canvas.fixcolorspace.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1655,6 +1656,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch54 -p0 -b .fixdbcheck.patch
 %patch55 -p1 -b .workspace.srb1.patch
 %patch56 -p0 -b .ooo107131.impress.tabledrag.crash
+%patch57 -p0 -b .oooXXXXX.canvas.fixcolorspace.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4165,6 +4167,7 @@ fi
 %changelog
 * Mon Nov 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-5.2
 - Resolves: rhbz#540379/ooo#107131 impress tabledrag crash
+- Resolves: rhbz#540231 add openoffice.org-3.2.0.oooXXXXX.canvas.fixcolorspace.patch
 
 * Thu Nov 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-5.1
 - next version