ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
59 lines
1.1 KiB
C
59 lines
1.1 KiB
C
|
|
/*
|
|
* 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.
|
|
*/
|
|
|
|
|
|
#ifndef SkFDot6_DEFINED
|
|
#define SkFDot6_DEFINED
|
|
|
|
#include "SkMath.h"
|
|
|
|
typedef int32_t SkFDot6;
|
|
|
|
#define SK_FDot6One (64)
|
|
#define SK_FDot6Half (32)
|
|
|
|
#ifdef SK_DEBUG
|
|
inline SkFDot6 SkIntToFDot6(S16CPU x) {
|
|
SkASSERT(SkToS16(x) == x);
|
|
return x << 6;
|
|
}
|
|
#else
|
|
#define SkIntToFDot6(x) ((x) << 6)
|
|
#endif
|
|
|
|
#define SkFDot6Floor(x) ((x) >> 6)
|
|
#define SkFDot6Ceil(x) (((x) + 63) >> 6)
|
|
#define SkFDot6Round(x) (((x) + 32) >> 6)
|
|
|
|
#define SkFixedToFDot6(x) ((x) >> 10)
|
|
|
|
inline SkFixed SkFDot6ToFixed(SkFDot6 x) {
|
|
SkASSERT((x << 10 >> 10) == x);
|
|
|
|
return x << 10;
|
|
}
|
|
|
|
#ifdef SK_SCALAR_IS_FLOAT
|
|
#define SkScalarToFDot6(x) (SkFDot6)((x) * 64)
|
|
#else
|
|
#define SkScalarToFDot6(x) ((x) >> 10)
|
|
#endif
|
|
|
|
inline SkFixed SkFDot6Div(SkFDot6 a, SkFDot6 b) {
|
|
SkASSERT(b != 0);
|
|
|
|
if (a == (int16_t)a) {
|
|
return (a << 16) / b;
|
|
} else {
|
|
return SkFixedDiv(a, b);
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|