mozilla-bug929439.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Thu, 02 Jan 2014 22:32:12 +0100
branchfirefox26
changeset 695 81c8f51dbf67
parent 694 89d4b9910eb7
permissions -rw-r--r--
add missing fixes
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
694
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# User Steve Singer <steve@ssinger.info>
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# Parent 23c23b472a4f73cef13cbd0c9a160402e840b456
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
Bug 929439 - Include string.h for memcpy. r=bgirard
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
diff --git a/gfx/layers/BufferUnrotate.cpp b/gfx/layers/BufferUnrotate.cpp
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
--- a/gfx/layers/BufferUnrotate.cpp
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
+++ b/gfx/layers/BufferUnrotate.cpp
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
@@ -3,16 +3,17 @@
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
  * License, v. 2.0. If a copy of the MPL was not distributed with this
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
 
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
 #include <algorithm> // min & max
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
 #include <cstdlib>
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 #include <stdint.h>
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
 #include <stdio.h>
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
 #include <stdlib.h>
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
+#include <string.h>
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
 
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
 void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight,
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
                     int aByteStride, int aXBoundary, int aYBoundary)
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
 {
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
   if (aXBoundary != 0) {
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
     uint8_t* line = new uint8_t[aByteWidth];
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
     uint32_t smallStart = 0;
89d4b9910eb7 PPC64LE support
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
     uint32_t smallLen = aXBoundary;