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
81 lines
2.7 KiB
C
81 lines
2.7 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 SkFloatingPoint_DEFINED
|
|
#define SkFloatingPoint_DEFINED
|
|
|
|
#include "SkTypes.h"
|
|
|
|
#ifdef SK_CAN_USE_FLOAT
|
|
|
|
#include <math.h>
|
|
#include <float.h>
|
|
#include "SkFloatBits.h"
|
|
|
|
// If math.h had powf(float, float), I could remove this wrapper
|
|
static inline float sk_float_pow(float base, float exp) {
|
|
return static_cast<float>(pow(static_cast<double>(base),
|
|
static_cast<double>(exp)));
|
|
}
|
|
|
|
static inline float sk_float_copysign(float x, float y) {
|
|
int32_t xbits = SkFloat2Bits(x);
|
|
int32_t ybits = SkFloat2Bits(y);
|
|
return SkBits2Float((xbits & 0x7FFFFFFF) | (ybits & 0x80000000));
|
|
}
|
|
|
|
#ifdef SK_BUILD_FOR_WINCE
|
|
#define sk_float_sqrt(x) (float)::sqrt(x)
|
|
#define sk_float_sin(x) (float)::sin(x)
|
|
#define sk_float_cos(x) (float)::cos(x)
|
|
#define sk_float_tan(x) (float)::tan(x)
|
|
#define sk_float_acos(x) (float)::acos(x)
|
|
#define sk_float_asin(x) (float)::asin(x)
|
|
#define sk_float_atan2(y,x) (float)::atan2(y,x)
|
|
#define sk_float_abs(x) (float)::fabs(x)
|
|
#define sk_float_mod(x,y) (float)::fmod(x,y)
|
|
#define sk_float_exp(x) (float)::exp(x)
|
|
#define sk_float_log(x) (float)::log(x)
|
|
#define sk_float_floor(x) (float)::floor(x)
|
|
#define sk_float_ceil(x) (float)::ceil(x)
|
|
#else
|
|
#define sk_float_sqrt(x) sqrtf(x)
|
|
#define sk_float_sin(x) sinf(x)
|
|
#define sk_float_cos(x) cosf(x)
|
|
#define sk_float_tan(x) tanf(x)
|
|
#define sk_float_floor(x) floorf(x)
|
|
#define sk_float_ceil(x) ceilf(x)
|
|
#ifdef SK_BUILD_FOR_MAC
|
|
#define sk_float_acos(x) static_cast<float>(acos(x))
|
|
#define sk_float_asin(x) static_cast<float>(asin(x))
|
|
#else
|
|
#define sk_float_acos(x) acosf(x)
|
|
#define sk_float_asin(x) asinf(x)
|
|
#endif
|
|
#define sk_float_atan2(y,x) atan2f(y,x)
|
|
#define sk_float_abs(x) fabsf(x)
|
|
#define sk_float_mod(x,y) fmodf(x,y)
|
|
#define sk_float_exp(x) expf(x)
|
|
#define sk_float_log(x) logf(x)
|
|
#define sk_float_isNaN(x) _isnan(x)
|
|
#endif
|
|
|
|
#ifdef SK_USE_FLOATBITS
|
|
#define sk_float_floor2int(x) SkFloatToIntFloor(x)
|
|
#define sk_float_round2int(x) SkFloatToIntRound(x)
|
|
#define sk_float_ceil2int(x) SkFloatToIntCeil(x)
|
|
#else
|
|
#define sk_float_floor2int(x) (int)sk_float_floor(x)
|
|
#define sk_float_round2int(x) (int)sk_float_floor((x) + 0.5f)
|
|
#define sk_float_ceil2int(x) (int)sk_float_ceil(x)
|
|
#endif
|
|
|
|
#endif
|
|
#endif
|