Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: third_party/lcms2-2.6/src/cmserr.c

Issue 2382723003: Move core/fxcrt/include to core/fxcrt (Closed)
Patch Set: Rebase to master Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/agg23/agg_vcgen_stroke.cpp ('k') | third_party/libjpeg/jinclude.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 //------------------------------------------------------------------------------ --- 1 //------------------------------------------------------------------------------ ---
2 // 2 //
3 // Little Color Management System 3 // Little Color Management System
4 // Copyright (c) 1998-2012 Marti Maria Saguer 4 // Copyright (c) 1998-2012 Marti Maria Saguer
5 // 5 //
6 // Permission is hereby granted, free of charge, to any person obtaining 6 // Permission is hereby granted, free of charge, to any person obtaining
7 // a copy of this software and associated documentation files (the "Software"), 7 // a copy of this software and associated documentation files (the "Software"),
8 // to deal in the Software without restriction, including without limitation 8 // to deal in the Software without restriction, including without limitation
9 // the rights to use, copy, modify, merge, publish, distribute, sublicense, 9 // the rights to use, copy, modify, merge, publish, distribute, sublicense,
10 // and/or sell copies of the Software, and to permit persons to whom the Softwar e 10 // and/or sell copies of the Software, and to permit persons to whom the Softwar e
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 244
245 // Set replacement functions 245 // Set replacement functions
246 ptr = (_cmsMemPluginChunkType*) _cmsContextGetClientChunk(ContextID, MemPlug in); 246 ptr = (_cmsMemPluginChunkType*) _cmsContextGetClientChunk(ContextID, MemPlug in);
247 if (ptr == NULL) 247 if (ptr == NULL)
248 return FALSE; 248 return FALSE;
249 249
250 _cmsInstallAllocFunctions(Plugin, ptr); 250 _cmsInstallAllocFunctions(Plugin, ptr);
251 return TRUE; 251 return TRUE;
252 } 252 }
253 #else 253 #else
254 #include "core/fxcrt/include/fx_memory.h" 254 #include "core/fxcrt/fx_memory.h"
255 #include "core/fxcrt/include/fx_system.h" 255 #include "core/fxcrt/fx_system.h"
256 256
257 cmsBool _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plugi n) 257 cmsBool _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plugi n)
258 { 258 {
259 return TRUE; 259 return TRUE;
260 } 260 }
261 261
262 // Generic allocate 262 // Generic allocate
263 void* CMSEXPORT _cmsMalloc(cmsContext ContextID, cmsUInt32Number size) 263 void* CMSEXPORT _cmsMalloc(cmsContext ContextID, cmsUInt32Number size)
264 { 264 {
265 return FXMEM_DefaultAlloc(size, 1); 265 return FXMEM_DefaultAlloc(size, 1);
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 698
699 void CMSEXPORT _cmsUnlockMutex(cmsContext ContextID, void* mtx) 699 void CMSEXPORT _cmsUnlockMutex(cmsContext ContextID, void* mtx)
700 { 700 {
701 _cmsMutexPluginChunkType* ptr = (_cmsMutexPluginChunkType*) _cmsContextGetCl ientChunk(ContextID, MutexPlugin); 701 _cmsMutexPluginChunkType* ptr = (_cmsMutexPluginChunkType*) _cmsContextGetCl ientChunk(ContextID, MutexPlugin);
702 702
703 if (ptr ->UnlockMutexPtr != NULL) { 703 if (ptr ->UnlockMutexPtr != NULL) {
704 704
705 ptr ->UnlockMutexPtr(ContextID, mtx); 705 ptr ->UnlockMutexPtr(ContextID, mtx);
706 } 706 }
707 } 707 }
OLDNEW
« no previous file with comments | « third_party/agg23/agg_vcgen_stroke.cpp ('k') | third_party/libjpeg/jinclude.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698