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
50 lines
1.4 KiB
C
50 lines
1.4 KiB
C
|
|
/*
|
|
* Copyright 2010 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
|
|
|
|
#ifndef GrScalar_DEFINED
|
|
#define GrScalar_DEFINED
|
|
|
|
#include "GrTypes.h"
|
|
#include "SkScalar.h"
|
|
|
|
#define GR_Int32Min SK_NaN32
|
|
#define GR_Int32Max SK_MaxS32
|
|
|
|
#define GR_Fixed1 SK_Fixed1
|
|
#define GR_FixedHalf SK_FixedHalf
|
|
#define GrIntToFixed(a) SkIntToFixed(a)
|
|
#define GrFixedToFloat(a) SkFixedToFloat(a)
|
|
#define GrFixedFloorToInt(a) SkFixedFloor(a)
|
|
|
|
#define GrScalar SkScalar
|
|
#define GR_Scalar1 SK_Scalar1
|
|
#define GR_ScalarHalf SK_ScalarHalf
|
|
#define GR_ScalarMin SK_ScalarMin
|
|
#define GR_ScalarMax SK_ScalarMax
|
|
|
|
#define GrIntToScalar(a) SkIntToScalar(a)
|
|
#define GrScalarHalf(a) SkScalarHalf(a)
|
|
#define GrScalarAve(a,b) SkScalarAve(a,b)
|
|
#define GrMul(a,b) SkScalarMul(a,b) // deprecated, prefer GrScalarMul
|
|
#define GrScalarMul(a,b) SkScalarMul(a,b)
|
|
#define GrScalarDiv(a,b) SkScalarDiv(a, b)
|
|
#define GrScalarToFloat(a) SkScalarToFloat(a)
|
|
#define GrFloatToScalar(a) SkScalarToFloat(a)
|
|
#define GrIntToScalar(a) SkIntToScalar(a)
|
|
#define GrScalarAbs(a) SkScalarAbs(a)
|
|
#define GrScalarIsInt(a) SkScalarIsInt(a)
|
|
#define GrScalarMax(a,b) SkScalarMax(a,b)
|
|
#define GrScalarFloorToInt(a) SkScalarFloor(a)
|
|
#define GrScalarCeilToInt(a) SkScalarCeil(a)
|
|
#define GrFixedToScalar(a) SkFixedToScalar(a)
|
|
|
|
#endif
|
|
|