summaryrefslogtreecommitdiff
path: root/third_party/lcms
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/lcms')
-rw-r--r--third_party/lcms/0000-cmserr-changes.patch10
-rw-r--r--third_party/lcms/src/cmserr.c10
2 files changed, 10 insertions, 10 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;
}
diff --git a/third_party/lcms/src/cmserr.c b/third_party/lcms/src/cmserr.c
index 3c3848b2a2..69b0550a41 100644
--- a/third_party/lcms/src/cmserr.c
+++ b/third_party/lcms/src/cmserr.c
@@ -75,13 +75,13 @@ cmsBool _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plugi
// Generic allocate
void* CMSEXPORT _cmsMalloc(cmsContext ContextID, cmsUInt32Number size)
{
- return FXMEM_DefaultAlloc(size, 1);
+ return FXMEM_DefaultAlloc(size);
}
// Generic allocate & zero
void* CMSEXPORT _cmsMallocZero(cmsContext ContextID, cmsUInt32Number size)
{
- void* p = FXMEM_DefaultAlloc(size, 1);
+ void* p = FXMEM_DefaultAlloc(size);
if (p) memset(p, 0, size);
return p;
}
@@ -99,19 +99,19 @@ void* CMSEXPORT _cmsCalloc(cmsContext ContextID, cmsUInt32Number num, cmsUInt32N
// Generic reallocate
void* CMSEXPORT _cmsRealloc(cmsContext ContextID, void* Ptr, cmsUInt32Number size)
{
- return FXMEM_DefaultRealloc(Ptr, size, 1);
+ return FXMEM_DefaultRealloc(Ptr, size);
}
// Generic free memory
void CMSEXPORT _cmsFree(cmsContext ContextID, void* Ptr)
{
- if (Ptr != NULL) FXMEM_DefaultFree(Ptr, 0);
+ if (Ptr != NULL) FXMEM_DefaultFree(Ptr);
}
// Generic block duplication
void* CMSEXPORT _cmsDupMem(cmsContext ContextID, const void* Org, cmsUInt32Number size)
{
- void* p = FXMEM_DefaultAlloc(size, 1);
+ void* p = FXMEM_DefaultAlloc(size);
memmove(p, Org, size);
return p;
}