strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS presfixes12 (1.9.26); FILE MERGED

Browse source 
2007/03/05 14:18:15 thb 1.9.26.2: #i37778# Added note to self
2007/02/02 09:21:53 thb 1.9.26.1: #i37778# Changed old-style int casts to sal::static_int_cast; changed (double)x casts to double(x) initializations
This commit is contained in:
Oliver Bolte 2007-07-17 13:24:17 +00:00
parent 894edf1c85
commit 14fc8ab455
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
canvas/source/tools/image.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: image.cxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: hr $ $Date: 2007-06-27 13:51:17 $
* last change: $Author: obo $ $Date: 2007-07-17 14:24:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -216,6 +216,8 @@ namespace canvas { namespace
o_rRenderColor = ARGB(0xFFFFFFFF,
renderState.DeviceColor);
// TODO(F3): handle compositing modes
if( viewState.Clip.is() )
{
::basegfx::B2DPolyPolygon aViewClip(
@ -801,7 +803,7 @@ namespace canvas { namespace
unsigned size() const { return maSteps; }
const T operator [] (unsigned v) const
{
const double w = ((double)v)/maSteps;
const double w = double(v)/maSteps;
return T( static_cast<value_type>(maColor1.r+(maColor2.r-maColor1.r)*w),
static_cast<value_type>(maColor1.g+(maColor2.g-maColor1.g)*w),
static_cast<value_type>(maColor1.b+(maColor2.b-maColor1.b)*w),
@ -834,8 +836,8 @@ namespace canvas { namespace
{
const double aHalfSteps = maSteps/2.0;
const double w = (v >= aHalfSteps) ?
1.0-(((double)v-aHalfSteps)/aHalfSteps) :
((double)v*2.0)/maSteps;
1.0-((double(v)-aHalfSteps)/aHalfSteps) :
(double(v)*2.0)/maSteps;
return T( static_cast<value_type>(maColor1.r+(maColor2.r-maColor1.r)*w),
static_cast<value_type>(maColor1.g+(maColor2.g-maColor1.g)*w),
static_cast<value_type>(maColor1.b+(maColor2.b-maColor1.b)*w),