diff options
author | drevil_xxl <drevil_xxl@users.sourceforge.net> | 2008-08-27 19:50:50 +0400 |
---|---|---|
committer | drevil_xxl <drevil_xxl@users.sourceforge.net> | 2008-08-27 19:50:50 +0400 |
commit | 3bc4b8d506f2fbaf6b46eb77ab57c41425a56d96 (patch) | |
tree | 2ff041b05cf3d53c13c1c503b893de0db26d0eda /src/subtitles/Rasterizer.cpp | |
parent | ae3f9d8b0fc262d32244a234d1c50dda20744578 (diff) |
guliverkli2 updates from rev. 77 & 78
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@758 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/subtitles/Rasterizer.cpp')
-rw-r--r-- | src/subtitles/Rasterizer.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/subtitles/Rasterizer.cpp b/src/subtitles/Rasterizer.cpp index 930d07fd6..f46944e19 100644 --- a/src/subtitles/Rasterizer.cpp +++ b/src/subtitles/Rasterizer.cpp @@ -709,13 +709,13 @@ bool Rasterizer::Rasterize(int xsub, int ysub, int fBlur, double fGaussianBlur) {
int bluradjust = 0;
if (fGaussianBlur > 0)
- mWideBorder += (int)(fGaussianBlur*3*8 + 0.5) | 1;
+ bluradjust += (int)(fGaussianBlur*3*8 + 0.5) | 1;
if (fBlur)
- mWideBorder += 8;
-
- mWideBorder = (mWideBorder+7)&~7;
+ bluradjust += 8;
// Expand the buffer a bit when we're blurring, since that can also widen the borders a bit
+ bluradjust = (bluradjust+7)&~7;
+
width += 2*mWideBorder + bluradjust*2;
height += 2*mWideBorder + bluradjust*2;
@@ -907,6 +907,7 @@ static __forceinline DWORD safe_subtract(DWORD a, DWORD b) DWORD r = (DWORD)_mm_cvtsi64_si32(rp);
_mm_empty();
return r;
+ //return (b > a) ? 0 : a - b;
}
// For CPUID usage in Rasterizer::Draw
@@ -1169,4 +1170,4 @@ void Rasterizer::FillSolidRect(SubPicDesc& spd, int x, int y, int nWidth, int nH for(int wt=0; wt<nWidth; ++wt)
pixmix(&dst[wt], lColor, lAlpha);
}
-}
\ No newline at end of file +}
|