summaryrefslogtreecommitdiff
path: root/patches/vclplug/vcl-source-gdi.diff
diff options
context:
space:
mode:
Diffstat (limited to 'patches/vclplug/vcl-source-gdi.diff')
-rw-r--r--patches/vclplug/vcl-source-gdi.diff22
1 files changed, 1 insertions, 21 deletions
diff --git a/patches/vclplug/vcl-source-gdi.diff b/patches/vclplug/vcl-source-gdi.diff
index 6d059d99c..39cff42c1 100644
--- a/patches/vclplug/vcl-source-gdi.diff
+++ b/patches/vclplug/vcl-source-gdi.diff
@@ -536,15 +536,7 @@ diff -u -p -u -r1.2.292.1 -r1.5
switch( eFilter )
{
-@@ -620,7 +618,7 @@ BOOL Bitmap::ImplEmbossGrey( const BmpFi
- aGrey.SetIndex( 0 );
- else
- {
-- const double fGrey = nDotL / sqrt( nNx * nNx + nNy * nNy + nZ2 );
-+ const double fGrey = nDotL / sqrt( (double)(nNx * nNx + nNy * nNy + nZ2) );
- aGrey.SetIndex( (BYTE) VOS_BOUND( fGrey, 0, 255 ) );
- }
-
+
Index: vcl/source/gdi/color.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/color.cxx,v
@@ -1454,18 +1446,6 @@ diff -u -p -u -r1.13 -r1.14
}
}
}
-@@ -1317,11 +1308,7 @@ String StarSymbolToMSMultiFontImpl::Conv
- String StarSymbolToMSMultiFontImpl::ConvertString(String &rString,
- xub_StrLen& rIndex)
- {
--#if 1
- typedef ::std::multimap<sal_Unicode, SymbolEntry>::iterator MI;
--#else
-- typedef ::std::multimap<sal_Unicode, SymbolEntry>::const_iterator MI;
--#endif
- typedef ::std::pair<MI, MI> Result;
-
- String sRet;
Index: vcl/source/gdi/gdimtf.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/gdimtf.cxx,v