← all fixtures

c-pixaranimationstudios-opensubdiv-change-license-comment

C View before/after files on GitHub Upstream commit PixarAnimationStudios-OpenSubdiv@17530d9 regression/common/far_utils.h

Requires a N:M match for perfect solution

This mapping has 1 multi-map group: several pairings are equally correct there. The code view shows one arbitrary valid pairing, not the only one.

Before

1//
2// Copyright 2013 Pixar
3//
4// Licensed under the Apache License, Version 2.0 (the "Apache License")
5// with the following modification; you may not use this file except in
6// compliance with the Apache License and the following modification to it:
7// Section 6. Trademarks. is deleted and replaced with:
8//
9// 6. Trademarks. This License does not grant permission to use the trade
10// names, trademarks, service marks, or product names of the Licensor
11// and its affiliates, except as required to comply with Section 4(c) of
12// the License and to reproduce the content of the NOTICE file.
13//
14// You may obtain a copy of the Apache License at
15//
16// http://www.apache.org/licenses/LICENSE-2.0
17//
18// Unless required by applicable law or agreed to in writing, software
19// distributed under the Apache License with the above modification is
20// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
21// KIND, either express or implied. See the Apache License for the specific
22// language governing permissions and limitations under the Apache License.
23//
24
25#ifndef FAR_UTILS_H
26#define FAR_UTILS_H
27
28#include "shape_utils.h"
29
…lines 30–364 unchanged (335 lines)

After

1//
2// Copyright 2013 Pixar
3//
4// Licensed under the terms set forth in the LICENSE.txt file available at
5// https://opensubdiv.org/license.
6//
7
8#ifndef FAR_UTILS_H
9#define FAR_UTILS_H
10
11#include "shape_utils.h"
12
13#include <opensubdiv/far/topologyRefinerFactory.h>
…lines 14–347 unchanged (334 lines)

Before

translation_unit
comment "//"
comment "// Copyright 2013 Pixar"
comment "//"
comment "// Licensed under the Apache License, Version 2.0 (the \"Ap"...
comment "// with the following modification; you may not use this f"...
comment "// compliance with the Apache License and the following mo"...
comment "// Section 6. Trademarks. is deleted and replaced with:"
comment "//" any 5:1
comment "// 6. Trademarks. This License does not grant permission t"...
comment "// names, trademarks, service marks, or product names o"...
comment "// and its affiliates, except as required to comply wit"...
comment "// the License and to reproduce the content of the NOTI"...
comment "//" any 5:1
comment "// You may obtain a copy of the Apache License at"
comment "//" any 5:1
comment "// http://www.apache.org/licenses/LICENSE-2.0"
comment "//" any 5:1
comment "// Unless required by applicable law or agreed to in writi"...
comment "// distributed under the Apache License with the above mod"...
comment "// distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR "...
comment "// KIND, either express or implied. See the Apache License"...
comment "// language governing permissions and limitations under th"...
comment "//" any 5:1
preproc_ifdef (+3275 nodes collapsed)
comment "/* FAR_UTILS_H */"

After

translation_unit
comment "//"
comment "// Copyright 2013 Pixar"
comment "//"
comment "// Licensed under the terms set forth in the LICENSE.txt f"...
comment "// https://opensubdiv.org/license."
comment "//" any 5:1
preproc_ifdef (+3275 nodes collapsed)
comment "/* FAR_UTILS_H */"