diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-02-06 13:31:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-06 13:31:51 -0800 |
| commit | 0a6004fdb6c99bccb8bc0bb9686616870dae73f3 (patch) | |
| tree | 2852f9dc2481f639122e18fc7831ae6ca43d6d5a /include/utils/SkCamera.h | |
| parent | e2d01455540d4414ebfc6acb06f06d357849335c (diff) | |
| parent | 1cab2921ab279367f8206cdadc9259d12e603548 (diff) | |
| download | external_skia-0a6004fdb6c99bccb8bc0bb9686616870dae73f3.zip external_skia-0a6004fdb6c99bccb8bc0bb9686616870dae73f3.tar.gz external_skia-0a6004fdb6c99bccb8bc0bb9686616870dae73f3.tar.bz2 | |
am 1cab2921: Skia merge (revision 3022)
* commit '1cab2921ab279367f8206cdadc9259d12e603548':
Skia merge (revision 3022)
Diffstat (limited to 'include/utils/SkCamera.h')
| -rw-r--r-- | include/utils/SkCamera.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/include/utils/SkCamera.h b/include/utils/SkCamera.h index 6d76018..57521b8 100644 --- a/include/utils/SkCamera.h +++ b/include/utils/SkCamera.h @@ -1,21 +1,14 @@ + /* - * Copyright (C) 2006 The Android Open Source Project - * - * 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 + * Copyright 2006 The Android Open Source Project * - * 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. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ + // Inspired by Rob Johnson's most excellent QuickDraw GX sample code #ifndef SkCamera_DEFINED @@ -157,7 +150,7 @@ public: void rotateY(SkScalar deg); void rotateZ(SkScalar deg); -#ifdef ANDROID +#ifdef SK_BUILD_FOR_ANDROID void setCameraLocation(SkScalar x, SkScalar y, SkScalar z); #endif |