From 9cfc7967ddf0368e9a9a3e22446ef341e472a2a1 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 11 Feb 2022 13:53:21 +0100 Subject: Cycles: use SPDX license headers * Replace license text in headers with SPDX identifiers. * Remove specific license info from outdated readme.txt, instead leave details to the source files. * Add list of SPDX license identifiers used, and corresponding license texts. * Update copyright dates while we're at it. Ref D14069, T95597 --- intern/cycles/util/CMakeLists.txt | 2 +- intern/cycles/util/algorithm.h | 17 ++-------- intern/cycles/util/aligned_malloc.cpp | 17 ++-------- intern/cycles/util/aligned_malloc.h | 17 ++-------- intern/cycles/util/args.h | 17 ++-------- intern/cycles/util/array.h | 17 ++-------- intern/cycles/util/atomic.h | 17 ++-------- intern/cycles/util/avxb.h | 17 ++-------- intern/cycles/util/avxf.h | 17 ++-------- intern/cycles/util/avxi.h | 17 ++-------- intern/cycles/util/boundbox.h | 17 ++-------- intern/cycles/util/color.h | 17 ++-------- intern/cycles/util/debug.cpp | 17 ++-------- intern/cycles/util/debug.h | 17 ++-------- intern/cycles/util/defines.h | 18 ++--------- intern/cycles/util/deque.h | 17 ++-------- intern/cycles/util/disjoint_set.h | 17 ++-------- intern/cycles/util/foreach.h | 17 ++-------- intern/cycles/util/function.h | 17 ++-------- intern/cycles/util/guarded_allocator.cpp | 17 ++-------- intern/cycles/util/guarded_allocator.h | 17 ++-------- intern/cycles/util/half.h | 17 ++-------- intern/cycles/util/hash.h | 17 ++-------- intern/cycles/util/ies.cpp | 17 ++-------- intern/cycles/util/ies.h | 17 ++-------- intern/cycles/util/image.h | 17 ++-------- intern/cycles/util/image_impl.h | 17 ++-------- intern/cycles/util/list.h | 17 ++-------- intern/cycles/util/log.cpp | 17 ++-------- intern/cycles/util/log.h | 17 ++-------- intern/cycles/util/map.h | 17 ++-------- intern/cycles/util/math.h | 17 ++-------- intern/cycles/util/math_cdf.cpp | 17 ++-------- intern/cycles/util/math_cdf.h | 17 ++-------- intern/cycles/util/math_fast.h | 29 ++--------------- intern/cycles/util/math_float2.h | 17 ++-------- intern/cycles/util/math_float3.h | 17 ++-------- intern/cycles/util/math_float4.h | 17 ++-------- intern/cycles/util/math_int2.h | 17 ++-------- intern/cycles/util/math_int3.h | 17 ++-------- intern/cycles/util/math_int4.h | 17 ++-------- intern/cycles/util/math_intersect.h | 17 ++-------- intern/cycles/util/math_matrix.h | 17 ++-------- intern/cycles/util/md5.cpp | 22 ++----------- intern/cycles/util/md5.h | 22 ++----------- intern/cycles/util/murmurhash.cpp | 17 ++-------- intern/cycles/util/murmurhash.h | 17 ++-------- intern/cycles/util/opengl.h | 17 ++-------- intern/cycles/util/openimagedenoise.h | 17 ++-------- intern/cycles/util/openvdb.h | 17 ++-------- intern/cycles/util/optimization.h | 17 ++-------- intern/cycles/util/param.h | 17 ++-------- intern/cycles/util/path.cpp | 17 ++-------- intern/cycles/util/path.h | 17 ++-------- intern/cycles/util/profiling.cpp | 17 ++-------- intern/cycles/util/profiling.h | 17 ++-------- intern/cycles/util/progress.h | 17 ++-------- intern/cycles/util/projection.h | 17 ++-------- intern/cycles/util/queue.h | 17 ++-------- intern/cycles/util/rect.h | 17 ++-------- intern/cycles/util/semaphore.h | 17 ++-------- intern/cycles/util/set.h | 17 ++-------- intern/cycles/util/simd.cpp | 17 ++-------- intern/cycles/util/simd.h | 17 ++-------- intern/cycles/util/sseb.h | 17 ++-------- intern/cycles/util/ssef.h | 17 ++-------- intern/cycles/util/ssei.h | 17 ++-------- intern/cycles/util/stack_allocator.h | 17 ++-------- intern/cycles/util/static_assert.h | 17 ++-------- intern/cycles/util/stats.h | 17 ++-------- intern/cycles/util/string.cpp | 17 ++-------- intern/cycles/util/string.h | 17 ++-------- intern/cycles/util/system.cpp | 17 ++-------- intern/cycles/util/system.h | 17 ++-------- intern/cycles/util/task.cpp | 17 ++-------- intern/cycles/util/task.h | 17 ++-------- intern/cycles/util/tbb.h | 17 ++-------- intern/cycles/util/texture.h | 17 ++-------- intern/cycles/util/thread.cpp | 17 ++-------- intern/cycles/util/thread.h | 17 ++-------- intern/cycles/util/time.cpp | 17 ++-------- intern/cycles/util/time.h | 17 ++-------- intern/cycles/util/transform.cpp | 54 +++++--------------------------- intern/cycles/util/transform.h | 17 ++-------- intern/cycles/util/types.h | 17 ++-------- intern/cycles/util/types_float2.h | 17 ++-------- intern/cycles/util/types_float2_impl.h | 17 ++-------- intern/cycles/util/types_float3.h | 17 ++-------- intern/cycles/util/types_float3_impl.h | 17 ++-------- intern/cycles/util/types_float4.h | 17 ++-------- intern/cycles/util/types_float4_impl.h | 17 ++-------- intern/cycles/util/types_float8.h | 28 ++--------------- intern/cycles/util/types_float8_impl.h | 28 ++--------------- intern/cycles/util/types_int2.h | 17 ++-------- intern/cycles/util/types_int2_impl.h | 17 ++-------- intern/cycles/util/types_int3.h | 17 ++-------- intern/cycles/util/types_int3_impl.h | 17 ++-------- intern/cycles/util/types_int4.h | 17 ++-------- intern/cycles/util/types_int4_impl.h | 17 ++-------- intern/cycles/util/types_uchar2.h | 17 ++-------- intern/cycles/util/types_uchar2_impl.h | 17 ++-------- intern/cycles/util/types_uchar3.h | 17 ++-------- intern/cycles/util/types_uchar3_impl.h | 17 ++-------- intern/cycles/util/types_uchar4.h | 17 ++-------- intern/cycles/util/types_uchar4_impl.h | 17 ++-------- intern/cycles/util/types_uint2.h | 17 ++-------- intern/cycles/util/types_uint2_impl.h | 17 ++-------- intern/cycles/util/types_uint3.h | 17 ++-------- intern/cycles/util/types_uint3_impl.h | 17 ++-------- intern/cycles/util/types_uint4.h | 17 ++-------- intern/cycles/util/types_uint4_impl.h | 17 ++-------- intern/cycles/util/types_ushort4.h | 17 ++-------- intern/cycles/util/types_vector3.h | 17 ++-------- intern/cycles/util/types_vector3_impl.h | 17 ++-------- intern/cycles/util/unique_ptr.h | 17 ++-------- intern/cycles/util/vector.h | 17 ++-------- intern/cycles/util/version.h | 17 ++-------- intern/cycles/util/view.cpp | 19 ++--------- intern/cycles/util/view.h | 17 ++-------- intern/cycles/util/windows.cpp | 17 ++-------- intern/cycles/util/windows.h | 17 ++-------- intern/cycles/util/xml.h | 17 ++-------- 122 files changed, 249 insertions(+), 1894 deletions(-) (limited to 'intern/cycles/util') diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index e65ce60ee89..0e348b1ac0f 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -1,5 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -# Copyright 2011-2020 Blender Foundation +# Copyright 2011-2022 Blender Foundation set(INC .. diff --git a/intern/cycles/util/algorithm.h b/intern/cycles/util/algorithm.h index 7a37ca0fdf4..68c48e1a928 100644 --- a/intern/cycles/util/algorithm.h +++ b/intern/cycles/util/algorithm.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_ALGORITHM_H__ #define __UTIL_ALGORITHM_H__ diff --git a/intern/cycles/util/aligned_malloc.cpp b/intern/cycles/util/aligned_malloc.cpp index 2b05559b55f..5081d25533e 100644 --- a/intern/cycles/util/aligned_malloc.cpp +++ b/intern/cycles/util/aligned_malloc.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2015 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/aligned_malloc.h" #include "util/guarded_allocator.h" diff --git a/intern/cycles/util/aligned_malloc.h b/intern/cycles/util/aligned_malloc.h index 66c2ac1c593..a6b478b74e0 100644 --- a/intern/cycles/util/aligned_malloc.h +++ b/intern/cycles/util/aligned_malloc.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2015 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_ALIGNED_MALLOC_H__ #define __UTIL_ALIGNED_MALLOC_H__ diff --git a/intern/cycles/util/args.h b/intern/cycles/util/args.h index be6f2c2b9f1..d8a9a6a0c7b 100644 --- a/intern/cycles/util/args.h +++ b/intern/cycles/util/args.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_ARGS_H__ #define __UTIL_ARGS_H__ diff --git a/intern/cycles/util/array.h b/intern/cycles/util/array.h index 1c5e3e8d4ec..335ec42e159 100644 --- a/intern/cycles/util/array.h +++ b/intern/cycles/util/array.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2018 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_ARRAY_H__ #define __UTIL_ARRAY_H__ diff --git a/intern/cycles/util/atomic.h b/intern/cycles/util/atomic.h index afc3fd019df..f89eb28b0b7 100644 --- a/intern/cycles/util/atomic.h +++ b/intern/cycles/util/atomic.h @@ -1,18 +1,5 @@ -/* - * Copyright 2014 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2014-2022 Blender Foundation */ #ifndef __UTIL_ATOMIC_H__ #define __UTIL_ATOMIC_H__ diff --git a/intern/cycles/util/avxb.h b/intern/cycles/util/avxb.h index 15215d04ca3..fa3cb565309 100644 --- a/intern/cycles/util/avxb.h +++ b/intern/cycles/util/avxb.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Copyright 2011-2013 Intel Corporation - * Modifications Copyright 2014, Blender Foundation. - * - * Licensed under the Apache License, Version 2.0(the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + * Modifications Copyright 2014-2022 Blender Foundation. */ #ifndef __UTIL_AVXB_H__ #define __UTIL_AVXB_H__ diff --git a/intern/cycles/util/avxf.h b/intern/cycles/util/avxf.h index 1fb3ded422f..03a13f30490 100644 --- a/intern/cycles/util/avxf.h +++ b/intern/cycles/util/avxf.h @@ -1,18 +1,5 @@ -/* - * Copyright 2016 Intel Corporation - * - * Licensed under the Apache License, Version 2.0(the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2016 Intel Corporation */ #ifndef __UTIL_AVXF_H__ #define __UTIL_AVXF_H__ diff --git a/intern/cycles/util/avxi.h b/intern/cycles/util/avxi.h index 0ae4bf271c8..966a04a6b97 100644 --- a/intern/cycles/util/avxi.h +++ b/intern/cycles/util/avxi.h @@ -1,18 +1,5 @@ -/* - * Copyright 2009-2013 Intel Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2009-2013 Intel Corporation */ #ifndef __UTIL_AVXI_H__ #define __UTIL_AVXI_H__ diff --git a/intern/cycles/util/boundbox.h b/intern/cycles/util/boundbox.h index ed81e4cf8c3..982f538f57f 100644 --- a/intern/cycles/util/boundbox.h +++ b/intern/cycles/util/boundbox.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_BOUNDBOX_H__ #define __UTIL_BOUNDBOX_H__ diff --git a/intern/cycles/util/color.h b/intern/cycles/util/color.h index e2a5c5b9c4a..cccccde3ba6 100644 --- a/intern/cycles/util/color.h +++ b/intern/cycles/util/color.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_COLOR_H__ #define __UTIL_COLOR_H__ diff --git a/intern/cycles/util/debug.cpp b/intern/cycles/util/debug.cpp index 717e55a2c9a..65d108bb9d1 100644 --- a/intern/cycles/util/debug.cpp +++ b/intern/cycles/util/debug.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2016 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/debug.h" diff --git a/intern/cycles/util/debug.h b/intern/cycles/util/debug.h index 1e431fde68a..23a055cf52f 100644 --- a/intern/cycles/util/debug.h +++ b/intern/cycles/util/debug.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_DEBUG_H__ #define __UTIL_DEBUG_H__ diff --git a/intern/cycles/util/defines.h b/intern/cycles/util/defines.h index a2e8d83adb7..115a747cf1c 100644 --- a/intern/cycles/util/defines.h +++ b/intern/cycles/util/defines.h @@ -1,19 +1,5 @@ - -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ /* clang-format off */ diff --git a/intern/cycles/util/deque.h b/intern/cycles/util/deque.h index ccac961aa7d..e557d647a7e 100644 --- a/intern/cycles/util/deque.h +++ b/intern/cycles/util/deque.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2018 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_DEQUE_H__ #define __UTIL_DEQUE_H__ diff --git a/intern/cycles/util/disjoint_set.h b/intern/cycles/util/disjoint_set.h index 5226423d7cd..9dd7948b9ec 100644 --- a/intern/cycles/util/disjoint_set.h +++ b/intern/cycles/util/disjoint_set.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_DISJOINT_SET_H__ #define __UTIL_DISJOINT_SET_H__ diff --git a/intern/cycles/util/foreach.h b/intern/cycles/util/foreach.h index d907974be91..450c206cf2e 100644 --- a/intern/cycles/util/foreach.h +++ b/intern/cycles/util/foreach.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_FOREACH_H__ #define __UTIL_FOREACH_H__ diff --git a/intern/cycles/util/function.h b/intern/cycles/util/function.h index f3cc00329ad..157451ebbc3 100644 --- a/intern/cycles/util/function.h +++ b/intern/cycles/util/function.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_FUNCTION_H__ #define __UTIL_FUNCTION_H__ diff --git a/intern/cycles/util/guarded_allocator.cpp b/intern/cycles/util/guarded_allocator.cpp index 4063b301331..ac238bbdd0f 100644 --- a/intern/cycles/util/guarded_allocator.cpp +++ b/intern/cycles/util/guarded_allocator.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2015 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/guarded_allocator.h" #include "util/stats.h" diff --git a/intern/cycles/util/guarded_allocator.h b/intern/cycles/util/guarded_allocator.h index f78cc5f5da9..d2330dc6d83 100644 --- a/intern/cycles/util/guarded_allocator.h +++ b/intern/cycles/util/guarded_allocator.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2015 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_GUARDED_ALLOCATOR_H__ #define __UTIL_GUARDED_ALLOCATOR_H__ diff --git a/intern/cycles/util/half.h b/intern/cycles/util/half.h index 555f17259bd..59ed652b346 100644 --- a/intern/cycles/util/half.h +++ b/intern/cycles/util/half.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_HALF_H__ #define __UTIL_HALF_H__ diff --git a/intern/cycles/util/hash.h b/intern/cycles/util/hash.h index 013a0f90a27..081b33025d8 100644 --- a/intern/cycles/util/hash.h +++ b/intern/cycles/util/hash.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_HASH_H__ #define __UTIL_HASH_H__ diff --git a/intern/cycles/util/ies.cpp b/intern/cycles/util/ies.cpp index e924d660407..894a6a44700 100644 --- a/intern/cycles/util/ies.cpp +++ b/intern/cycles/util/ies.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2018 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include diff --git a/intern/cycles/util/ies.h b/intern/cycles/util/ies.h index 7be072dd5f5..cb414c77faf 100644 --- a/intern/cycles/util/ies.h +++ b/intern/cycles/util/ies.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2018 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_IES_H__ #define __UTIL_IES_H__ diff --git a/intern/cycles/util/image.h b/intern/cycles/util/image.h index 69fc3a50c1d..9348125d072 100644 --- a/intern/cycles/util/image.h +++ b/intern/cycles/util/image.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_IMAGE_H__ # define __UTIL_IMAGE_H__ diff --git a/intern/cycles/util/image_impl.h b/intern/cycles/util/image_impl.h index 3d8eed80775..1775fc77e97 100644 --- a/intern/cycles/util/image_impl.h +++ b/intern/cycles/util/image_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2016 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_IMAGE_IMPL_H__ #define __UTIL_IMAGE_IMPL_H__ diff --git a/intern/cycles/util/list.h b/intern/cycles/util/list.h index f555b001186..e7ed5d01c0c 100644 --- a/intern/cycles/util/list.h +++ b/intern/cycles/util/list.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_LIST_H__ #define __UTIL_LIST_H__ diff --git a/intern/cycles/util/log.cpp b/intern/cycles/util/log.cpp index 68a5a3f576f..304b563cda6 100644 --- a/intern/cycles/util/log.cpp +++ b/intern/cycles/util/log.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2014 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/log.h" diff --git a/intern/cycles/util/log.h b/intern/cycles/util/log.h index 35c2d436d09..b33c826d6f5 100644 --- a/intern/cycles/util/log.h +++ b/intern/cycles/util/log.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2014 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_LOGGING_H__ #define __UTIL_LOGGING_H__ diff --git a/intern/cycles/util/map.h b/intern/cycles/util/map.h index f1b2522362f..9bac68eb13f 100644 --- a/intern/cycles/util/map.h +++ b/intern/cycles/util/map.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MAP_H__ #define __UTIL_MAP_H__ diff --git a/intern/cycles/util/math.h b/intern/cycles/util/math.h index 5f047f6f3f4..ed9f230398d 100644 --- a/intern/cycles/util/math.h +++ b/intern/cycles/util/math.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MATH_H__ #define __UTIL_MATH_H__ diff --git a/intern/cycles/util/math_cdf.cpp b/intern/cycles/util/math_cdf.cpp index 02c6646f824..928cd6a1932 100644 --- a/intern/cycles/util/math_cdf.cpp +++ b/intern/cycles/util/math_cdf.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2015 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/math_cdf.h" diff --git a/intern/cycles/util/math_cdf.h b/intern/cycles/util/math_cdf.h index 4c57dac4bbe..82e6a69c04b 100644 --- a/intern/cycles/util/math_cdf.h +++ b/intern/cycles/util/math_cdf.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2015 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MATH_CDF_H__ #define __UTIL_MATH_CDF_H__ diff --git a/intern/cycles/util/math_fast.h b/intern/cycles/util/math_fast.h index e2a33b1c26c..2221e7a9835 100644 --- a/intern/cycles/util/math_fast.h +++ b/intern/cycles/util/math_fast.h @@ -1,34 +1,9 @@ -/* - * Adapted from OpenImageIO library with this license: +/* SPDX-License-Identifier: BSD-3-Clause * + * Adapted from OpenImageIO * Copyright 2008-2014 Larry Gritz and the other authors and contributors. * All Rights Reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the software's owners nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * (This is the Modified BSD License) - * * A few bits here are based upon code from NVIDIA that was also released * under the same modified BSD license, and marked as: * Copyright 2004 NVIDIA Corporation. All Rights Reserved. diff --git a/intern/cycles/util/math_float2.h b/intern/cycles/util/math_float2.h index 8ff75c6c20a..d6b47052720 100644 --- a/intern/cycles/util/math_float2.h +++ b/intern/cycles/util/math_float2.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MATH_FLOAT2_H__ #define __UTIL_MATH_FLOAT2_H__ diff --git a/intern/cycles/util/math_float3.h b/intern/cycles/util/math_float3.h index 74f1c98e649..365c322dd7e 100644 --- a/intern/cycles/util/math_float3.h +++ b/intern/cycles/util/math_float3.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MATH_FLOAT3_H__ #define __UTIL_MATH_FLOAT3_H__ diff --git a/intern/cycles/util/math_float4.h b/intern/cycles/util/math_float4.h index 1203a10cca4..9f4a1a904b5 100644 --- a/intern/cycles/util/math_float4.h +++ b/intern/cycles/util/math_float4.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MATH_FLOAT4_H__ #define __UTIL_MATH_FLOAT4_H__ diff --git a/intern/cycles/util/math_int2.h b/intern/cycles/util/math_int2.h index 39dc3b28f11..f4d8a71221a 100644 --- a/intern/cycles/util/math_int2.h +++ b/intern/cycles/util/math_int2.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MATH_INT2_H__ #define __UTIL_MATH_INT2_H__ diff --git a/intern/cycles/util/math_int3.h b/intern/cycles/util/math_int3.h index a09c68ef49a..48bffeaf553 100644 --- a/intern/cycles/util/math_int3.h +++ b/intern/cycles/util/math_int3.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MATH_INT3_H__ #define __UTIL_MATH_INT3_H__ diff --git a/intern/cycles/util/math_int4.h b/intern/cycles/util/math_int4.h index eaa9be73b63..fbdada223cb 100644 --- a/intern/cycles/util/math_int4.h +++ b/intern/cycles/util/math_int4.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MATH_INT4_H__ #define __UTIL_MATH_INT4_H__ diff --git a/intern/cycles/util/math_intersect.h b/intern/cycles/util/math_intersect.h index 0fce9ff24fd..b0de0b25a45 100644 --- a/intern/cycles/util/math_intersect.h +++ b/intern/cycles/util/math_intersect.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MATH_INTERSECT_H__ #define __UTIL_MATH_INTERSECT_H__ diff --git a/intern/cycles/util/math_matrix.h b/intern/cycles/util/math_matrix.h index 846b028a513..a4318fda6e8 100644 --- a/intern/cycles/util/math_matrix.h +++ b/intern/cycles/util/math_matrix.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_MATH_MATRIX_H__ #define __UTIL_MATH_MATRIX_H__ diff --git a/intern/cycles/util/md5.cpp b/intern/cycles/util/md5.cpp index 47e489b1aed..1c7e6b9bf3e 100644 --- a/intern/cycles/util/md5.cpp +++ b/intern/cycles/util/md5.cpp @@ -1,25 +1,7 @@ -/* +/* SPDX-License-Identifier: Zlib * Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * * L. Peter Deutsch - * ghost@aladdin.com - */ + * ghost@aladdin.com */ /* Minor modifications done to remove some code and change style. */ diff --git a/intern/cycles/util/md5.h b/intern/cycles/util/md5.h index cc7cbef6a49..d30ad10c2f2 100644 --- a/intern/cycles/util/md5.h +++ b/intern/cycles/util/md5.h @@ -1,25 +1,7 @@ -/* +/* SPDX-License-Identifier: Zlib * Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * * L. Peter Deutsch - * ghost@aladdin.com - */ + * ghost@aladdin.com */ /* MD5 * diff --git a/intern/cycles/util/murmurhash.cpp b/intern/cycles/util/murmurhash.cpp index 603e4a717a1..eb59bd36646 100644 --- a/intern/cycles/util/murmurhash.cpp +++ b/intern/cycles/util/murmurhash.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2018 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2018-2022 Blender Foundation */ /* This is taken from alShaders/Cryptomatte/MurmurHash3.h: * diff --git a/intern/cycles/util/murmurhash.h b/intern/cycles/util/murmurhash.h index 7c303db6ffa..333a586ed9c 100644 --- a/intern/cycles/util/murmurhash.h +++ b/intern/cycles/util/murmurhash.h @@ -1,18 +1,5 @@ -/* - * Copyright 2018 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2018-2022 Blender Foundation */ #ifndef __UTIL_MURMURHASH_H__ #define __UTIL_MURMURHASH_H__ diff --git a/intern/cycles/util/opengl.h b/intern/cycles/util/opengl.h index 7a8d5eec1f9..090deb861c4 100644 --- a/intern/cycles/util/opengl.h +++ b/intern/cycles/util/opengl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_OPENGL_H__ #define __UTIL_OPENGL_H__ diff --git a/intern/cycles/util/openimagedenoise.h b/intern/cycles/util/openimagedenoise.h index cc7b14ae18f..ac946777a8c 100644 --- a/intern/cycles/util/openimagedenoise.h +++ b/intern/cycles/util/openimagedenoise.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_OPENIMAGEDENOISE_H__ #define __UTIL_OPENIMAGEDENOISE_H__ diff --git a/intern/cycles/util/openvdb.h b/intern/cycles/util/openvdb.h index ae5326e3199..02b42b0f1ff 100644 --- a/intern/cycles/util/openvdb.h +++ b/intern/cycles/util/openvdb.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2020 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_OPENVDB_H__ #define __UTIL_OPENVDB_H__ diff --git a/intern/cycles/util/optimization.h b/intern/cycles/util/optimization.h index 7ecd3893cf4..19b96510c47 100644 --- a/intern/cycles/util/optimization.h +++ b/intern/cycles/util/optimization.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_OPTIMIZATION_H__ #define __UTIL_OPTIMIZATION_H__ diff --git a/intern/cycles/util/param.h b/intern/cycles/util/param.h index 3f8e2d6d700..861b1b71bc6 100644 --- a/intern/cycles/util/param.h +++ b/intern/cycles/util/param.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_PARAM_H__ #define __UTIL_PARAM_H__ diff --git a/intern/cycles/util/path.cpp b/intern/cycles/util/path.cpp index 4efdeeae7f0..17cff2f2977 100644 --- a/intern/cycles/util/path.cpp +++ b/intern/cycles/util/path.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/path.h" #include "util/md5.h" diff --git a/intern/cycles/util/path.h b/intern/cycles/util/path.h index 98c3302eae2..48b1fb65919 100644 --- a/intern/cycles/util/path.h +++ b/intern/cycles/util/path.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_PATH_H__ #define __UTIL_PATH_H__ diff --git a/intern/cycles/util/profiling.cpp b/intern/cycles/util/profiling.cpp index d6df1b0b807..6bee5c08da3 100644 --- a/intern/cycles/util/profiling.cpp +++ b/intern/cycles/util/profiling.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2018 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/profiling.h" #include "util/algorithm.h" diff --git a/intern/cycles/util/profiling.h b/intern/cycles/util/profiling.h index 4ced1d90371..1f65c54e86f 100644 --- a/intern/cycles/util/profiling.h +++ b/intern/cycles/util/profiling.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2018 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_PROFILING_H__ #define __UTIL_PROFILING_H__ diff --git a/intern/cycles/util/progress.h b/intern/cycles/util/progress.h index 15bd26d34bf..37eafd57491 100644 --- a/intern/cycles/util/progress.h +++ b/intern/cycles/util/progress.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_PROGRESS_H__ #define __UTIL_PROGRESS_H__ diff --git a/intern/cycles/util/projection.h b/intern/cycles/util/projection.h index 8d822a3777d..0f078f1537c 100644 --- a/intern/cycles/util/projection.h +++ b/intern/cycles/util/projection.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2018 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_PROJECTION_H__ #define __UTIL_PROJECTION_H__ diff --git a/intern/cycles/util/queue.h b/intern/cycles/util/queue.h index 622f4fe3e47..fe51fb52c30 100644 --- a/intern/cycles/util/queue.h +++ b/intern/cycles/util/queue.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2015 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_QUEUE_H__ #define __UTIL_QUEUE_H__ diff --git a/intern/cycles/util/rect.h b/intern/cycles/util/rect.h index 79d64b917b7..bc89d1905ce 100644 --- a/intern/cycles/util/rect.h +++ b/intern/cycles/util/rect.h @@ -1,18 +1,5 @@ -/* - * Copyright 2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2017-2022 Blender Foundation */ #ifndef __UTIL_RECT_H__ #define __UTIL_RECT_H__ diff --git a/intern/cycles/util/semaphore.h b/intern/cycles/util/semaphore.h index 8da8a232ba2..7506ae264cf 100644 --- a/intern/cycles/util/semaphore.h +++ b/intern/cycles/util/semaphore.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2020 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_SEMAPHORE_H__ #define __UTIL_SEMAPHORE_H__ diff --git a/intern/cycles/util/set.h b/intern/cycles/util/set.h index 298e1f7729a..184febd4478 100644 --- a/intern/cycles/util/set.h +++ b/intern/cycles/util/set.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_SET_H__ #define __UTIL_SET_H__ diff --git a/intern/cycles/util/simd.cpp b/intern/cycles/util/simd.cpp index 089444bb6cc..9e6cd9fa7af 100644 --- a/intern/cycles/util/simd.cpp +++ b/intern/cycles/util/simd.cpp @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Copyright 2011-2013 Intel Corporation - * Modifications Copyright 2014, Blender Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + * Modifications Copyright 2014-2022 Blender Foundation. */ #if (defined(WITH_KERNEL_SSE2)) || (defined(WITH_KERNEL_NATIVE) && defined(__SSE2__)) diff --git a/intern/cycles/util/simd.h b/intern/cycles/util/simd.h index cc4950891d0..15dda4e76a8 100644 --- a/intern/cycles/util/simd.h +++ b/intern/cycles/util/simd.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Copyright 2011-2013 Intel Corporation - * Modifications Copyright 2014, Blender Foundation. - * - * Licensed under the Apache License, Version 2.0(the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + * Modifications Copyright 2014-2022 Blender Foundation. */ #ifndef __UTIL_SIMD_TYPES_H__ #define __UTIL_SIMD_TYPES_H__ diff --git a/intern/cycles/util/sseb.h b/intern/cycles/util/sseb.h index 6afce4f8909..6f78299711e 100644 --- a/intern/cycles/util/sseb.h +++ b/intern/cycles/util/sseb.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Copyright 2011-2013 Intel Corporation - * Modifications Copyright 2014, Blender Foundation. - * - * Licensed under the Apache License, Version 2.0(the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + * Modifications Copyright 2014-2022 Blender Foundation. */ #ifndef __UTIL_SSEB_H__ #define __UTIL_SSEB_H__ diff --git a/intern/cycles/util/ssef.h b/intern/cycles/util/ssef.h index fc496e55a0c..a2fff94303e 100644 --- a/intern/cycles/util/ssef.h +++ b/intern/cycles/util/ssef.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Copyright 2011-2013 Intel Corporation - * Modifications Copyright 2014, Blender Foundation. - * - * Licensed under the Apache License, Version 2.0(the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + * Modifications Copyright 2014-2022 Blender Foundation. */ #ifndef __UTIL_SSEF_H__ #define __UTIL_SSEF_H__ diff --git a/intern/cycles/util/ssei.h b/intern/cycles/util/ssei.h index 94412fb77e7..5caf44c967f 100644 --- a/intern/cycles/util/ssei.h +++ b/intern/cycles/util/ssei.h @@ -1,19 +1,6 @@ -/* +/* SPDX-License-Identifier: Apache-2.0 * Copyright 2011-2013 Intel Corporation - * Modifications Copyright 2014, Blender Foundation. - * - * Licensed under the Apache License, Version 2.0(the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + * Modifications Copyright 2014-2022 Blender Foundation. */ #ifndef __UTIL_SSEI_H__ #define __UTIL_SSEI_H__ diff --git a/intern/cycles/util/stack_allocator.h b/intern/cycles/util/stack_allocator.h index ef31c0fe5e2..285a6596ae4 100644 --- a/intern/cycles/util/stack_allocator.h +++ b/intern/cycles/util/stack_allocator.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2016 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_STACK_ALLOCATOR_H__ #define __UTIL_STACK_ALLOCATOR_H__ diff --git a/intern/cycles/util/static_assert.h b/intern/cycles/util/static_assert.h index 7df52d462b7..c544553c4a6 100644 --- a/intern/cycles/util/static_assert.h +++ b/intern/cycles/util/static_assert.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2016 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ /* clang-format off */ diff --git a/intern/cycles/util/stats.h b/intern/cycles/util/stats.h index 590973f1cbc..2e266d135ca 100644 --- a/intern/cycles/util/stats.h +++ b/intern/cycles/util/stats.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_STATS_H__ #define __UTIL_STATS_H__ diff --git a/intern/cycles/util/string.cpp b/intern/cycles/util/string.cpp index b98272f7759..66ff866ee10 100644 --- a/intern/cycles/util/string.cpp +++ b/intern/cycles/util/string.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include #include diff --git a/intern/cycles/util/string.h b/intern/cycles/util/string.h index cc20a6df120..a74feee1750 100644 --- a/intern/cycles/util/string.h +++ b/intern/cycles/util/string.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #pragma once diff --git a/intern/cycles/util/system.cpp b/intern/cycles/util/system.cpp index 61ad552fa89..3241601d048 100644 --- a/intern/cycles/util/system.cpp +++ b/intern/cycles/util/system.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/system.h" diff --git a/intern/cycles/util/system.h b/intern/cycles/util/system.h index d26c324be0a..23dcfdd303a 100644 --- a/intern/cycles/util/system.h +++ b/intern/cycles/util/system.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_SYSTEM_H__ #define __UTIL_SYSTEM_H__ diff --git a/intern/cycles/util/task.cpp b/intern/cycles/util/task.cpp index 174befce571..2edc82eb7c3 100644 --- a/intern/cycles/util/task.cpp +++ b/intern/cycles/util/task.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/task.h" #include "util/foreach.h" diff --git a/intern/cycles/util/task.h b/intern/cycles/util/task.h index 0117c51d05c..02885e780db 100644 --- a/intern/cycles/util/task.h +++ b/intern/cycles/util/task.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TASK_H__ #define __UTIL_TASK_H__ diff --git a/intern/cycles/util/tbb.h b/intern/cycles/util/tbb.h index 6fc3b8daad3..2c26c3a5170 100644 --- a/intern/cycles/util/tbb.h +++ b/intern/cycles/util/tbb.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2020 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TBB_H__ #define __UTIL_TBB_H__ diff --git a/intern/cycles/util/texture.h b/intern/cycles/util/texture.h index 5e37b79e340..33ff349704b 100644 --- a/intern/cycles/util/texture.h +++ b/intern/cycles/util/texture.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2016 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TEXTURE_H__ #define __UTIL_TEXTURE_H__ diff --git a/intern/cycles/util/thread.cpp b/intern/cycles/util/thread.cpp index e2e785b9a80..f4949aa2b44 100644 --- a/intern/cycles/util/thread.cpp +++ b/intern/cycles/util/thread.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2016 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/thread.h" diff --git a/intern/cycles/util/thread.h b/intern/cycles/util/thread.h index bd6a83e1dd1..8d7dc45b03e 100644 --- a/intern/cycles/util/thread.h +++ b/intern/cycles/util/thread.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_THREAD_H__ #define __UTIL_THREAD_H__ diff --git a/intern/cycles/util/time.cpp b/intern/cycles/util/time.cpp index 62d14b063be..d27a0415106 100644 --- a/intern/cycles/util/time.cpp +++ b/intern/cycles/util/time.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/time.h" diff --git a/intern/cycles/util/time.h b/intern/cycles/util/time.h index 380921664e8..db23e4ac51f 100644 --- a/intern/cycles/util/time.h +++ b/intern/cycles/util/time.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TIME_H__ #define __UTIL_TIME_H__ diff --git a/intern/cycles/util/transform.cpp b/intern/cycles/util/transform.cpp index bd990cb0f79..fa50e1db063 100644 --- a/intern/cycles/util/transform.cpp +++ b/intern/cycles/util/transform.cpp @@ -1,50 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * Adapted from code with license: - * - * Copyright (c) 2002, Industrial Light & Magic, a division of Lucas - * Digital Ltd. LLC. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Industrial Light & Magic nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include "util/transform.h" #include "util/projection.h" @@ -58,6 +13,11 @@ CCL_NAMESPACE_BEGIN static bool transform_matrix4_gj_inverse(float R[][4], float M[][4]) { + /* SPDX-License-Identifier: BSD-3-Clause + * Adapted from code: + * Copyright (c) 2002, Industrial Light & Magic, a division of Lucas + * Digital Ltd. LLC. All rights reserved. */ + /* forward elimination */ for (int i = 0; i < 4; i++) { int pivot = i; diff --git a/intern/cycles/util/transform.h b/intern/cycles/util/transform.h index 84827cf6ba5..371dbb0f4aa 100644 --- a/intern/cycles/util/transform.h +++ b/intern/cycles/util/transform.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TRANSFORM_H__ #define __UTIL_TRANSFORM_H__ diff --git a/intern/cycles/util/types.h b/intern/cycles/util/types.h index 58a6d134819..031c2f7c4c1 100644 --- a/intern/cycles/util/types.h +++ b/intern/cycles/util/types.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_H__ #define __UTIL_TYPES_H__ diff --git a/intern/cycles/util/types_float2.h b/intern/cycles/util/types_float2.h index e71204bef5b..d8b2efb7b4b 100644 --- a/intern/cycles/util/types_float2.h +++ b/intern/cycles/util/types_float2.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_FLOAT2_H__ #define __UTIL_TYPES_FLOAT2_H__ diff --git a/intern/cycles/util/types_float2_impl.h b/intern/cycles/util/types_float2_impl.h index c02c13f8c47..d67ec946b79 100644 --- a/intern/cycles/util/types_float2_impl.h +++ b/intern/cycles/util/types_float2_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_FLOAT2_IMPL_H__ #define __UTIL_TYPES_FLOAT2_IMPL_H__ diff --git a/intern/cycles/util/types_float3.h b/intern/cycles/util/types_float3.h index cafcfebf526..060c2ac4152 100644 --- a/intern/cycles/util/types_float3.h +++ b/intern/cycles/util/types_float3.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_FLOAT3_H__ #define __UTIL_TYPES_FLOAT3_H__ diff --git a/intern/cycles/util/types_float3_impl.h b/intern/cycles/util/types_float3_impl.h index 76a9067acc7..f5ffc48c1be 100644 --- a/intern/cycles/util/types_float3_impl.h +++ b/intern/cycles/util/types_float3_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_FLOAT3_IMPL_H__ #define __UTIL_TYPES_FLOAT3_IMPL_H__ diff --git a/intern/cycles/util/types_float4.h b/intern/cycles/util/types_float4.h index 8d4e07e7e4d..68ba787dac0 100644 --- a/intern/cycles/util/types_float4.h +++ b/intern/cycles/util/types_float4.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_FLOAT4_H__ #define __UTIL_TYPES_FLOAT4_H__ diff --git a/intern/cycles/util/types_float4_impl.h b/intern/cycles/util/types_float4_impl.h index d75715332e5..de2e7cb7061 100644 --- a/intern/cycles/util/types_float4_impl.h +++ b/intern/cycles/util/types_float4_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_FLOAT4_IMPL_H__ #define __UTIL_TYPES_FLOAT4_IMPL_H__ diff --git a/intern/cycles/util/types_float8.h b/intern/cycles/util/types_float8.h index cf1f66b7622..99f9ec9b867 100644 --- a/intern/cycles/util/types_float8.h +++ b/intern/cycles/util/types_float8.h @@ -1,30 +1,6 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Original code Copyright 2017, Intel Corporation - * Modifications Copyright 2018, Blender Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + * Modifications Copyright 2018-2022 Blender Foundation. */ #ifndef __UTIL_TYPES_FLOAT8_H__ #define __UTIL_TYPES_FLOAT8_H__ diff --git a/intern/cycles/util/types_float8_impl.h b/intern/cycles/util/types_float8_impl.h index a795666adc7..19818976b50 100644 --- a/intern/cycles/util/types_float8_impl.h +++ b/intern/cycles/util/types_float8_impl.h @@ -1,30 +1,6 @@ -/* +/* SPDX-License-Identifier: BSD-3-Clause * Original code Copyright 2017, Intel Corporation - * Modifications Copyright 2018, Blender Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + * Modifications Copyright 2018-2022 Blender Foundation. */ #ifndef __UTIL_TYPES_FLOAT8_IMPL_H__ #define __UTIL_TYPES_FLOAT8_IMPL_H__ diff --git a/intern/cycles/util/types_int2.h b/intern/cycles/util/types_int2.h index 75970577d77..4daf387d9cf 100644 --- a/intern/cycles/util/types_int2.h +++ b/intern/cycles/util/types_int2.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_INT2_H__ #define __UTIL_TYPES_INT2_H__ diff --git a/intern/cycles/util/types_int2_impl.h b/intern/cycles/util/types_int2_impl.h index efa63cdfd2a..7989c4d5506 100644 --- a/intern/cycles/util/types_int2_impl.h +++ b/intern/cycles/util/types_int2_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_INT2_IMPL_H__ #define __UTIL_TYPES_INT2_IMPL_H__ diff --git a/intern/cycles/util/types_int3.h b/intern/cycles/util/types_int3.h index 071a886136e..ad9bcb39bbe 100644 --- a/intern/cycles/util/types_int3.h +++ b/intern/cycles/util/types_int3.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_INT3_H__ #define __UTIL_TYPES_INT3_H__ diff --git a/intern/cycles/util/types_int3_impl.h b/intern/cycles/util/types_int3_impl.h index c91c64b804e..4cfc1cf2987 100644 --- a/intern/cycles/util/types_int3_impl.h +++ b/intern/cycles/util/types_int3_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_INT3_IMPL_H__ #define __UTIL_TYPES_INT3_IMPL_H__ diff --git a/intern/cycles/util/types_int4.h b/intern/cycles/util/types_int4.h index cb497d70035..f35632fb52f 100644 --- a/intern/cycles/util/types_int4.h +++ b/intern/cycles/util/types_int4.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_INT4_H__ #define __UTIL_TYPES_INT4_H__ diff --git a/intern/cycles/util/types_int4_impl.h b/intern/cycles/util/types_int4_impl.h index 258b42c029e..adb4a4cebac 100644 --- a/intern/cycles/util/types_int4_impl.h +++ b/intern/cycles/util/types_int4_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_INT4_IMPL_H__ #define __UTIL_TYPES_INT4_IMPL_H__ diff --git a/intern/cycles/util/types_uchar2.h b/intern/cycles/util/types_uchar2.h index 0dc1d46bf29..445fa8dd703 100644 --- a/intern/cycles/util/types_uchar2.h +++ b/intern/cycles/util/types_uchar2.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UCHAR2_H__ #define __UTIL_TYPES_UCHAR2_H__ diff --git a/intern/cycles/util/types_uchar2_impl.h b/intern/cycles/util/types_uchar2_impl.h index 234a71a2247..cec1c679050 100644 --- a/intern/cycles/util/types_uchar2_impl.h +++ b/intern/cycles/util/types_uchar2_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UCHAR2_IMPL_H__ #define __UTIL_TYPES_UCHAR2_IMPL_H__ diff --git a/intern/cycles/util/types_uchar3.h b/intern/cycles/util/types_uchar3.h index d3913afb3a2..1ebd86441c3 100644 --- a/intern/cycles/util/types_uchar3.h +++ b/intern/cycles/util/types_uchar3.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UCHAR3_H__ #define __UTIL_TYPES_UCHAR3_H__ diff --git a/intern/cycles/util/types_uchar3_impl.h b/intern/cycles/util/types_uchar3_impl.h index 90f510e3b28..0656baa3da4 100644 --- a/intern/cycles/util/types_uchar3_impl.h +++ b/intern/cycles/util/types_uchar3_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UCHAR3_IMPL_H__ #define __UTIL_TYPES_UCHAR3_IMPL_H__ diff --git a/intern/cycles/util/types_uchar4.h b/intern/cycles/util/types_uchar4.h index bfe1c06acd8..2ac4fb56cbb 100644 --- a/intern/cycles/util/types_uchar4.h +++ b/intern/cycles/util/types_uchar4.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UCHAR4_H__ #define __UTIL_TYPES_UCHAR4_H__ diff --git a/intern/cycles/util/types_uchar4_impl.h b/intern/cycles/util/types_uchar4_impl.h index d15c74bed03..b3e8abfe873 100644 --- a/intern/cycles/util/types_uchar4_impl.h +++ b/intern/cycles/util/types_uchar4_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UCHAR4_IMPL_H__ #define __UTIL_TYPES_UCHAR4_IMPL_H__ diff --git a/intern/cycles/util/types_uint2.h b/intern/cycles/util/types_uint2.h index 7419977040b..e3254b9f0e1 100644 --- a/intern/cycles/util/types_uint2.h +++ b/intern/cycles/util/types_uint2.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UINT2_H__ #define __UTIL_TYPES_UINT2_H__ diff --git a/intern/cycles/util/types_uint2_impl.h b/intern/cycles/util/types_uint2_impl.h index 8427f9694b5..e67134a011e 100644 --- a/intern/cycles/util/types_uint2_impl.h +++ b/intern/cycles/util/types_uint2_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UINT2_IMPL_H__ #define __UTIL_TYPES_UINT2_IMPL_H__ diff --git a/intern/cycles/util/types_uint3.h b/intern/cycles/util/types_uint3.h index 1e97e7f2d36..885a8fb84ce 100644 --- a/intern/cycles/util/types_uint3.h +++ b/intern/cycles/util/types_uint3.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UINT3_H__ #define __UTIL_TYPES_UINT3_H__ diff --git a/intern/cycles/util/types_uint3_impl.h b/intern/cycles/util/types_uint3_impl.h index ba83cffe9a8..f4d3d72469c 100644 --- a/intern/cycles/util/types_uint3_impl.h +++ b/intern/cycles/util/types_uint3_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UINT3_IMPL_H__ #define __UTIL_TYPES_UINT3_IMPL_H__ diff --git a/intern/cycles/util/types_uint4.h b/intern/cycles/util/types_uint4.h index b135877b890..d582b91d2a0 100644 --- a/intern/cycles/util/types_uint4.h +++ b/intern/cycles/util/types_uint4.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UINT4_H__ #define __UTIL_TYPES_UINT4_H__ diff --git a/intern/cycles/util/types_uint4_impl.h b/intern/cycles/util/types_uint4_impl.h index b860fbfc49a..98a4c5e9fe9 100644 --- a/intern/cycles/util/types_uint4_impl.h +++ b/intern/cycles/util/types_uint4_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_UINT4_IMPL_H__ #define __UTIL_TYPES_UINT4_IMPL_H__ diff --git a/intern/cycles/util/types_ushort4.h b/intern/cycles/util/types_ushort4.h index 8d080bcc1b9..1766c6bf734 100644 --- a/intern/cycles/util/types_ushort4.h +++ b/intern/cycles/util/types_ushort4.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_USHORT4_H__ #define __UTIL_TYPES_USHORT4_H__ diff --git a/intern/cycles/util/types_vector3.h b/intern/cycles/util/types_vector3.h index d46a0266855..2e0d68e1bd0 100644 --- a/intern/cycles/util/types_vector3.h +++ b/intern/cycles/util/types_vector3.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_VECTOR3_H__ #define __UTIL_TYPES_VECTOR3_H__ diff --git a/intern/cycles/util/types_vector3_impl.h b/intern/cycles/util/types_vector3_impl.h index ff6dcd85b12..a765780e2d3 100644 --- a/intern/cycles/util/types_vector3_impl.h +++ b/intern/cycles/util/types_vector3_impl.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2017 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_TYPES_VECTOR3_IMPL_H__ #define __UTIL_TYPES_VECTOR3_IMPL_H__ diff --git a/intern/cycles/util/unique_ptr.h b/intern/cycles/util/unique_ptr.h index 3181eafd43d..8894e06e04c 100644 --- a/intern/cycles/util/unique_ptr.h +++ b/intern/cycles/util/unique_ptr.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_UNIQUE_PTR_H__ #define __UTIL_UNIQUE_PTR_H__ diff --git a/intern/cycles/util/vector.h b/intern/cycles/util/vector.h index db35f198dc1..0056fb269ae 100644 --- a/intern/cycles/util/vector.h +++ b/intern/cycles/util/vector.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_VECTOR_H__ #define __UTIL_VECTOR_H__ diff --git a/intern/cycles/util/version.h b/intern/cycles/util/version.h index 8bce5ff85aa..f13ba637424 100644 --- a/intern/cycles/util/version.h +++ b/intern/cycles/util/version.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2016 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_VERSION_H__ #define __UTIL_VERSION_H__ diff --git a/intern/cycles/util/view.cpp b/intern/cycles/util/view.cpp index 1c70cea1a8b..475f8dbcee8 100644 --- a/intern/cycles/util/view.cpp +++ b/intern/cycles/util/view.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #include #include @@ -101,7 +88,7 @@ void view_display_help() string info = string("Cycles Renderer ") + CYCLES_VERSION_STRING; view_display_text(x1 + 20, y2 - 20, info.c_str()); - view_display_text(x1 + 20, y2 - 40, "(C) 2011-2016 Blender Foundation"); + view_display_text(x1 + 20, y2 - 40, "(C) 2011-2022 Blender Foundation"); view_display_text(x1 + 20, y2 - 80, "Controls:"); view_display_text(x1 + 20, y2 - 100, "h: Info/Help"); view_display_text(x1 + 20, y2 - 120, "r: Reset"); diff --git a/intern/cycles/util/view.h b/intern/cycles/util/view.h index ad5c53ee5d5..51c242c21f7 100644 --- a/intern/cycles/util/view.h +++ b/intern/cycles/util/view.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_VIEW_H__ #define __UTIL_VIEW_H__ diff --git a/intern/cycles/util/windows.cpp b/intern/cycles/util/windows.cpp index 96944d07390..f879029a790 100644 --- a/intern/cycles/util/windows.cpp +++ b/intern/cycles/util/windows.cpp @@ -1,18 +1,5 @@ -/* - * Copyright 2019-2019 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2019-2022 Blender Foundation */ #ifdef _WIN32 # include diff --git a/intern/cycles/util/windows.h b/intern/cycles/util/windows.h index 9cbf91a23a7..ec1c5d6caea 100644 --- a/intern/cycles/util/windows.h +++ b/intern/cycles/util/windows.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2016 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_WINDOWS_H__ #define __UTIL_WINDOWS_H__ diff --git a/intern/cycles/util/xml.h b/intern/cycles/util/xml.h index 6f06f17937b..bfc0ee6d37d 100644 --- a/intern/cycles/util/xml.h +++ b/intern/cycles/util/xml.h @@ -1,18 +1,5 @@ -/* - * Copyright 2011-2013 Blender Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright 2011-2022 Blender Foundation */ #ifndef __UTIL_XML_H__ #define __UTIL_XML_H__ -- cgit v1.2.3