From a5bbc044b47f2fd82a91155dde74f92d795877f1 Mon Sep 17 00:00:00 2001 From: Marti Maria Date: Fri, 7 Mar 2014 12:53:51 +0100 Subject: Some copyright updates --- include/lcms2.h | 8 ++------ src/cmstypes.c | 5 ++--- src/cmsvirt.c | 2 +- src/cmswtpnt.c | 2 +- src/cmsxform.c | 2 +- src/lcms2_internal.h | 6 +++--- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/include/lcms2.h b/include/lcms2.h index 1fe0492..8bf7e11 100644 --- a/include/lcms2.h +++ b/include/lcms2.h @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2013 Marti Maria Saguer +// Copyright (c) 1998-2014 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -1013,11 +1013,7 @@ CMSAPI long int CMSEXPORT cmsfilelength(FILE* f); // Each context holds its owns globals and its own plug-ins. There is a global context with the id = 0 for lecacy compatibility // though using the global context is not recomended. Proper context handling makes lcms more thread-safe. -#ifdef CMS_CONTEXT_IN_LEGACY_MODE - typedef void* cmsContext; -#else - typedef struct _cmsContext_struct* cmsContext; -#endif +typedef struct _cmsContext_struct* cmsContext; CMSAPI cmsContext CMSEXPORT cmsCreateContext(void* Plugin, void* UserData); CMSAPI void CMSEXPORT cmsDeleteContext(cmsContext ContexID); diff --git a/src/cmstypes.c b/src/cmstypes.c index a9e3fa0..60c09ef 100644 --- a/src/cmstypes.c +++ b/src/cmstypes.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2011 Marti Maria Saguer +// Copyright (c) 1998-2014 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -32,7 +32,7 @@ // are no profiles holding them. The programmer can also extend this list by defining his own types // by using the appropiate plug-in. There are three types of plug ins regarding that. First type // allows to define new tags using any existing type. Next plug-in type allows to define new types -// and the third one is very specific: allows to extend the number of elements in the multiprofile +// and the third one is very specific: allows to extend the number of elements in the multiprocessing // elements special type. //-------------------------------------------------------------------------------------------------- @@ -1752,7 +1752,6 @@ void *Type_LUT8_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cms if (!_cmsReadUInt8Number(io, NULL)) goto Error; // Do some checking - if (InputChannels > cmsMAXCHANNELS) goto Error; if (OutputChannels > cmsMAXCHANNELS) goto Error; diff --git a/src/cmsvirt.c b/src/cmsvirt.c index deeb7a6..b324c99 100644 --- a/src/cmsvirt.c +++ b/src/cmsvirt.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2011 Marti Maria Saguer +// Copyright (c) 1998-2014 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmswtpnt.c b/src/cmswtpnt.c index 84e3a32..e657b13 100644 --- a/src/cmswtpnt.c +++ b/src/cmswtpnt.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2014 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/cmsxform.c b/src/cmsxform.c index b2705cb..56afede 100644 --- a/src/cmsxform.c +++ b/src/cmsxform.c @@ -1,7 +1,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2011 Marti Maria Saguer +// Copyright (c) 1998-2014 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/src/lcms2_internal.h b/src/lcms2_internal.h index b21b03e..1a64830 100644 --- a/src/lcms2_internal.h +++ b/src/lcms2_internal.h @@ -1,7 +1,7 @@ // // Little Color Management System -// Copyright (c) 1998-2011 Marti Maria Saguer +// Copyright (c) 1998-2014 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -174,7 +174,7 @@ cmsINLINE cmsUInt16Number _cmsQuickSaturateWord(cmsFloat64Number d) #ifdef CMS_IS_WINDOWS_ #define WIN32_LEAN_AND_MEAN 1 -#include +#include // From: http://locklessinc.com/articles/pthreads_on_windows/ @@ -359,7 +359,7 @@ cmsBool _cmsRegisterMutexPlugin(cmsContext ContextID, cmsPluginBase* Plugin); // --------------------------------------------------------------------------------------------------------- -// Suballocators. Those are blocks of memory that is freed at the end on whole block. +// Suballocators. typedef struct _cmsSubAllocator_chunk_st { cmsUInt8Number* Block; -- cgit v1.2.1