summaryrefslogtreecommitdiff
path: root/third_party/lcms/0000-cmserr-changes.patch
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2017-11-03 22:18:18 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-03 22:18:18 +0000
commitb810da2788d0aca491bee55b0f9d97b48e682bbf (patch)
tree5bc3c77f1fc0945b6db71c62f9f347ff3dc1e398 /third_party/lcms/0000-cmserr-changes.patch
parent882a190807b6f791e3b3f1a692c59fb93d746f94 (diff)
downloadpdfium-b810da2788d0aca491bee55b0f9d97b48e682bbf.tar.xz
Remove flags param from FXMEM_DefaultAlloc() and friends.
Change-Id: I24404be0065156a1cfdec31bafdf72c27fa70142 Reviewed-on: https://pdfium-review.googlesource.com/17792 Reviewed-by: Chris Palmer <palmer@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'third_party/lcms/0000-cmserr-changes.patch')
-rw-r--r--third_party/lcms/0000-cmserr-changes.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/third_party/lcms/0000-cmserr-changes.patch b/third_party/lcms/0000-cmserr-changes.patch
index 5ccaac9ee1..baf35772a0 100644
--- a/third_party/lcms/0000-cmserr-changes.patch
+++ b/third_party/lcms/0000-cmserr-changes.patch
@@ -51,7 +51,7 @@ index 700152ee3..3c3848b2a 100644
+// Generic allocate
+void* CMSEXPORT _cmsMalloc(cmsContext ContextID, cmsUInt32Number size)
+{
-+ return FXMEM_DefaultAlloc(size, 1);
++ return FXMEM_DefaultAlloc(size);
}
// Generic allocate & zero
@@ -64,7 +64,7 @@ index 700152ee3..3c3848b2a 100644
-
- memset(pt, 0, size);
- return pt;
-+ void* p = FXMEM_DefaultAlloc(size, 1);
++ void* p = FXMEM_DefaultAlloc(size);
+ if (p) memset(p, 0, size);
+ return p;
}
@@ -101,7 +101,7 @@ index 700152ee3..3c3848b2a 100644
- return realloc(Ptr, size);
-
- cmsUNUSED_PARAMETER(ContextID);
-+ return FXMEM_DefaultRealloc(Ptr, size, 1);
++ return FXMEM_DefaultRealloc(Ptr, size);
}
-
@@ -128,7 +128,7 @@ index 700152ee3..3c3848b2a 100644
- if (Total > MAX_MEMORY_FOR_ALLOC) return NULL; // Never alloc over 512Mb
-
- return _cmsMallocZero(ContextID, Total);
-+ if (Ptr != NULL) FXMEM_DefaultFree(Ptr, 0);
++ if (Ptr != NULL) FXMEM_DefaultFree(Ptr);
}
// Generic block duplication
@@ -146,7 +146,7 @@ index 700152ee3..3c3848b2a 100644
- memmove(mem, Org, size);
-
- return mem;
-+ void* p = FXMEM_DefaultAlloc(size, 1);
++ void* p = FXMEM_DefaultAlloc(size);
+ memmove(p, Org, size);
+ return p;
}