diff options
author | Mark H Weaver <mhw@netris.org> | 2016-02-05 12:17:00 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-02-05 16:00:25 -0500 |
commit | a7d8c466db633bbdf10c0aebce7128c627c28342 (patch) | |
tree | 0c3b0d8023c548a36c1b3476c039e2e5908d9fb5 /gnu/packages/patches/icecat-bug-1146335-pt2.patch | |
parent | 95b754a17ad3192086a9e8ce514e25d980039d50 (diff) | |
download | guix-a7d8c466db633bbdf10c0aebce7128c627c28342.tar guix-a7d8c466db633bbdf10c0aebce7128c627c28342.tar.gz |
gnu: icecat: Update to 38.6.0-gnu1.
* gnu/packages/patches/icecat-bug-1146335-pt1.patch,
gnu/packages/patches/icecat-bug-1146335-pt2.patch,
gnu/packages/patches/icecat-limit-max-buffers-size-for-ANGLE.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt01.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt02.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt03.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt04.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt05.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt06.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt07.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt08.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt09.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt10.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt11.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt12.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt13.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt14.patch,
gnu/packages/patches/icecat-CVE-2016-1930-pt15.patch,
gnu/packages/patches/icecat-CVE-2016-1935.patch: Delete files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/gnuzilla.scm (icecat): Update to 38.6.0-gnu1.
[source]: Remove patches.
Diffstat (limited to 'gnu/packages/patches/icecat-bug-1146335-pt2.patch')
-rw-r--r-- | gnu/packages/patches/icecat-bug-1146335-pt2.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/gnu/packages/patches/icecat-bug-1146335-pt2.patch b/gnu/packages/patches/icecat-bug-1146335-pt2.patch deleted file mode 100644 index 240e0cfc66..0000000000 --- a/gnu/packages/patches/icecat-bug-1146335-pt2.patch +++ /dev/null @@ -1,43 +0,0 @@ -Copied from: https://hg.mozilla.org/releases/mozilla-esr38/rev/8bfaa27698ca -Mozilla Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1146335 - -# HG changeset patch -# User Seth Fowler <mark.seth.fowler@gmail.com> -# Date 1428627143 25200 -# Node ID 8bfaa27698ca0720d5c9f3910ab7148b38db0625 -# Parent 9d14787bd10e6f3013263a2cae0bcc78bebde1db -Bug 1146335 (Part 2) - Fix an off-by-one error in image::Downscaler. r=tn a=lizzard - -diff --git a/image/src/Downscaler.cpp b/image/src/Downscaler.cpp ---- a/image/src/Downscaler.cpp -+++ b/image/src/Downscaler.cpp -@@ -160,20 +160,26 @@ Downscaler::CommitRow() - int32_t inLineToRead = filterOffset + mLinesInBuffer; - MOZ_ASSERT(mCurrentInLine <= inLineToRead, "Reading past end of input"); - if (mCurrentInLine == inLineToRead) { - skia::ConvolveHorizontally(mRowBuffer.get(), *mXFilter, - mWindow[mLinesInBuffer++], mHasAlpha, - /* use_sse2 = */ true); - } - -- while (mLinesInBuffer == filterLength && -- mCurrentOutLine < mTargetSize.height) { -+ MOZ_ASSERT(mCurrentOutLine < mTargetSize.height, -+ "Writing past end of output"); -+ -+ while (mLinesInBuffer == filterLength) { - DownscaleInputLine(); - -+ if (mCurrentOutLine == mTargetSize.height) { -+ break; // We're done. -+ } -+ - GetFilterOffsetAndLength(mYFilter, mCurrentOutLine, - &filterOffset, &filterLength); - } - - mCurrentInLine += 1; - } - - bool - |