diff options
Diffstat (limited to 'src/utils')
35 files changed, 243 insertions, 142 deletions
diff --git a/src/utils/SDL/SkOSWindow_SDL.cpp b/src/utils/SDL/SkOSWindow_SDL.cpp index b6b6882368..c2ba8b4349 100644 --- a/src/utils/SDL/SkOSWindow_SDL.cpp +++ b/src/utils/SDL/SkOSWindow_SDL.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkOSWindow_SDL.h" #include "SkCanvas.h" #include "SkColorPriv.h" diff --git a/src/utils/SkBoundaryPatch.cpp b/src/utils/SkBoundaryPatch.cpp index cdbc877634..37f59b4596 100644 --- a/src/utils/SkBoundaryPatch.cpp +++ b/src/utils/SkBoundaryPatch.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkBoundaryPatch.h" SkBoundaryPatch::SkBoundaryPatch() : fBoundary(NULL) {} diff --git a/src/utils/SkCamera.cpp b/src/utils/SkCamera.cpp index 3e7315b07f..328f588090 100644 --- a/src/utils/SkCamera.cpp +++ b/src/utils/SkCamera.cpp @@ -1,19 +1,11 @@ -/* libs/graphics/effects/SkCamera.cpp -** -** Copyright 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 -** -** 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. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "SkCamera.h" diff --git a/src/utils/SkColorMatrix.cpp b/src/utils/SkColorMatrix.cpp index e61c1ccb92..cb77de1449 100644 --- a/src/utils/SkColorMatrix.cpp +++ b/src/utils/SkColorMatrix.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkColorMatrix.h" #define kRScale 0 diff --git a/src/utils/SkCubicInterval.cpp b/src/utils/SkCubicInterval.cpp index 7a6084c4a3..6c6b0a96e5 100644 --- a/src/utils/SkCubicInterval.cpp +++ b/src/utils/SkCubicInterval.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkCubicInterval.h" static SkScalar eval_cubic(SkScalar c1, SkScalar c2, SkScalar c3, diff --git a/src/utils/SkCullPoints.cpp b/src/utils/SkCullPoints.cpp index c8d58c1487..a903075f71 100644 --- a/src/utils/SkCullPoints.cpp +++ b/src/utils/SkCullPoints.cpp @@ -1,19 +1,11 @@ -/* libs/graphics/effects/SkCullPoints.cpp -** -** Copyright 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 -** -** 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. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "SkCullPoints.h" #include "Sk64.h" diff --git a/src/utils/SkDebugTrace.h b/src/utils/SkDebugTrace.h index 1f0c190459..447418e139 100644 --- a/src/utils/SkDebugTrace.h +++ b/src/utils/SkDebugTrace.h @@ -1,18 +1,11 @@ -/* - Copyright 2011 Google Inc. - - 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. +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ + #ifndef SkUserTrace_DEFINED #define SkUserTrace_DEFINED diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp index af67c06035..c66eb684e2 100644 --- a/src/utils/SkDumpCanvas.cpp +++ b/src/utils/SkDumpCanvas.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkDumpCanvas.h" #include "SkPicture.h" #include "SkPixelRef.h" diff --git a/src/utils/SkEGLContext_none.cpp b/src/utils/SkEGLContext_none.cpp index cb08f400ee..25f8513b49 100644 --- a/src/utils/SkEGLContext_none.cpp +++ b/src/utils/SkEGLContext_none.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkEGLContext.h" SkEGLContext::SkEGLContext() { diff --git a/src/utils/SkInterpolator.cpp b/src/utils/SkInterpolator.cpp index c5bb4480fb..d43792f77b 100644 --- a/src/utils/SkInterpolator.cpp +++ b/src/utils/SkInterpolator.cpp @@ -1,19 +1,12 @@ + /* - * Copyright (C) 2006-2008 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 2008 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. */ + #include "SkInterpolator.h" #include "SkMath.h" #include "SkTSearch.h" diff --git a/src/utils/SkLayer.cpp b/src/utils/SkLayer.cpp index 1c484bd3c2..aaca786080 100644 --- a/src/utils/SkLayer.cpp +++ b/src/utils/SkLayer.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkLayer.h" #include "SkCanvas.h" diff --git a/src/utils/SkMatrix44.cpp b/src/utils/SkMatrix44.cpp index f3f98a5279..a57f9b117a 100644 --- a/src/utils/SkMatrix44.cpp +++ b/src/utils/SkMatrix44.cpp @@ -1,20 +1,13 @@ -/* - Copyright 2011 Google Inc. - - 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. +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ + #include "SkMatrix44.h" SkMatrix44::SkMatrix44() { diff --git a/src/utils/SkMeshUtils.cpp b/src/utils/SkMeshUtils.cpp index 0385b99d01..f7af3834d5 100644 --- a/src/utils/SkMeshUtils.cpp +++ b/src/utils/SkMeshUtils.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkMeshUtils.h" #include "SkCanvas.h" #include "SkPaint.h" diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp index d60f259f67..016ea9169b 100644 --- a/src/utils/SkNWayCanvas.cpp +++ b/src/utils/SkNWayCanvas.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkNWayCanvas.h" SkNWayCanvas::SkNWayCanvas() {} diff --git a/src/utils/SkNinePatch.cpp b/src/utils/SkNinePatch.cpp index bbda573294..16e815d4c8 100644 --- a/src/utils/SkNinePatch.cpp +++ b/src/utils/SkNinePatch.cpp @@ -1,18 +1,11 @@ + /* -** Copyright 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 -** -** 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. -*/ + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "SkNinePatch.h" #include "SkCanvas.h" diff --git a/src/utils/SkOSFile.cpp b/src/utils/SkOSFile.cpp index c1b69436f4..fd5d273920 100644 --- a/src/utils/SkOSFile.cpp +++ b/src/utils/SkOSFile.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkOSFile.h" #ifdef SK_BUILD_FOR_WIN diff --git a/src/utils/SkParse.cpp b/src/utils/SkParse.cpp index 69808a34c4..f93e2ef1b2 100644 --- a/src/utils/SkParse.cpp +++ b/src/utils/SkParse.cpp @@ -1,19 +1,11 @@ -/* libs/graphics/xml/SkParse.cpp -** -** Copyright 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 -** -** 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. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "SkParse.h" diff --git a/src/utils/SkParseColor.cpp b/src/utils/SkParseColor.cpp index 43d0737a40..db47aae82c 100644 --- a/src/utils/SkParseColor.cpp +++ b/src/utils/SkParseColor.cpp @@ -1,19 +1,11 @@ -/* libs/graphics/xml/SkParseColor.cpp -** -** Copyright 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 -** -** 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. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "SkParse.h" diff --git a/src/utils/SkParsePath.cpp b/src/utils/SkParsePath.cpp index e08e84c19c..60304935fd 100644 --- a/src/utils/SkParsePath.cpp +++ b/src/utils/SkParsePath.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkParse.h" #include "SkParsePath.h" diff --git a/src/utils/SkProxyCanvas.cpp b/src/utils/SkProxyCanvas.cpp index 9c94d598e3..5664a7a200 100644 --- a/src/utils/SkProxyCanvas.cpp +++ b/src/utils/SkProxyCanvas.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkProxyCanvas.h" SkProxyCanvas::SkProxyCanvas(SkCanvas* proxy) : fProxy(proxy) { diff --git a/src/utils/SkSfntUtils.cpp b/src/utils/SkSfntUtils.cpp index ba9f3f6e45..54f7cc33aa 100644 --- a/src/utils/SkSfntUtils.cpp +++ b/src/utils/SkSfntUtils.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkEndian.h" #include "SkSfntUtils.h" diff --git a/src/utils/SkUnitMappers.cpp b/src/utils/SkUnitMappers.cpp index 2a4aaa7ec4..583d091791 100644 --- a/src/utils/SkUnitMappers.cpp +++ b/src/utils/SkUnitMappers.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkUnitMappers.h" SkDiscreteMapper::SkDiscreteMapper(int segments) { diff --git a/src/utils/mac/SkBitmap_Mac.cpp b/src/utils/mac/SkBitmap_Mac.cpp index 06c2b2701a..a99513135d 100644 --- a/src/utils/mac/SkBitmap_Mac.cpp +++ b/src/utils/mac/SkBitmap_Mac.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkBitmap.h" #include "SkColorPriv.h" #include "SkMath.h" diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp index 4a098b1864..e5f7c69cb8 100644 --- a/src/utils/mac/SkCreateCGImageRef.cpp +++ b/src/utils/mac/SkCreateCGImageRef.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkCGUtils.h" #include "SkBitmap.h" #include "SkColorPriv.h" diff --git a/src/utils/mac/SkEGLContext_mac.cpp b/src/utils/mac/SkEGLContext_mac.cpp index e601f35617..d23779515c 100644 --- a/src/utils/mac/SkEGLContext_mac.cpp +++ b/src/utils/mac/SkEGLContext_mac.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkEGLContext.h" //#include "SkTypes.h" #include <AGL/agl.h> diff --git a/src/utils/mac/SkOSWindow_Mac.cpp b/src/utils/mac/SkOSWindow_Mac.cpp index 0538371506..5731a4d1a6 100644 --- a/src/utils/mac/SkOSWindow_Mac.cpp +++ b/src/utils/mac/SkOSWindow_Mac.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkTypes.h" #if defined(SK_BUILD_FOR_MAC) && !defined(SK_USE_WXWIDGETS) diff --git a/src/utils/mac/skia_mac.cpp b/src/utils/mac/skia_mac.cpp index 21f74653fd..1ec0ea935b 100644 --- a/src/utils/mac/skia_mac.cpp +++ b/src/utils/mac/skia_mac.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include <Carbon/Carbon.h> #include "SkApplication.h" #include "SkWindow.h" diff --git a/src/utils/mesa/SkEGLContext_Mesa.cpp b/src/utils/mesa/SkEGLContext_Mesa.cpp index ed1b7cd451..fdb2ac0602 100644 --- a/src/utils/mesa/SkEGLContext_Mesa.cpp +++ b/src/utils/mesa/SkEGLContext_Mesa.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkEGLContext.h" #include "SkTypes.h" diff --git a/src/utils/unix/SkEGLContext_Unix.cpp b/src/utils/unix/SkEGLContext_Unix.cpp index 7921b8a542..6eb7e35534 100644 --- a/src/utils/unix/SkEGLContext_Unix.cpp +++ b/src/utils/unix/SkEGLContext_Unix.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkEGLContext.h" #include "SkTypes.h" diff --git a/src/utils/unix/SkOSWindow_Unix.cpp b/src/utils/unix/SkOSWindow_Unix.cpp index a75216676d..8fe064d87e 100644 --- a/src/utils/unix/SkOSWindow_Unix.cpp +++ b/src/utils/unix/SkOSWindow_Unix.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include <X11/Xlib.h> #include <X11/Xatom.h> #include <X11/keysym.h> diff --git a/src/utils/win/SkAutoCoInitialize.cpp b/src/utils/win/SkAutoCoInitialize.cpp index 7249341993..460606bb1d 100644 --- a/src/utils/win/SkAutoCoInitialize.cpp +++ b/src/utils/win/SkAutoCoInitialize.cpp @@ -1,19 +1,12 @@ -/* - Copyright 2011 Google Inc. - - 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. +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ + #define WIN32_LEAN_AND_MEAN #include <Windows.h> #include <ole2.h> diff --git a/src/utils/win/SkEGLContext_Win.cpp b/src/utils/win/SkEGLContext_Win.cpp index 2629ac3a5f..c2483e7d92 100644 --- a/src/utils/win/SkEGLContext_Win.cpp +++ b/src/utils/win/SkEGLContext_Win.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #define WIN32_LEAN_AND_MEAN 1 #include <Windows.h> #include <GL/GL.h> diff --git a/src/utils/win/SkIStream.cpp b/src/utils/win/SkIStream.cpp index 29e1c87d53..a857f40e7d 100644 --- a/src/utils/win/SkIStream.cpp +++ b/src/utils/win/SkIStream.cpp @@ -1,19 +1,12 @@ -/* - Copyright 2011 Google Inc. - - 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. +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ + #define WIN32_LEAN_AND_MEAN #include <Windows.h> #include <ole2.h> diff --git a/src/utils/win/SkOSWindow_Win.cpp b/src/utils/win/SkOSWindow_Win.cpp index b63386c710..ed8d6e08cf 100644 --- a/src/utils/win/SkOSWindow_Win.cpp +++ b/src/utils/win/SkOSWindow_Win.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkTypes.h" #if defined(SK_BUILD_FOR_WIN) diff --git a/src/utils/win/skia_win.cpp b/src/utils/win/skia_win.cpp index c7aa9fd2ff..0fbc7fc05c 100644 --- a/src/utils/win/skia_win.cpp +++ b/src/utils/win/skia_win.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include <Windows.h>
#include <tchar.h>
#define MAX_LOADSTRING 100
|