add SkSize for dimensions
git-svn-id: http://skia.googlecode.com/svn/trunk@172 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
f76b1b6566
commit
6a5a2667a7
2
Makefile
2
Makefile
@ -110,7 +110,7 @@ TESTS_SRCS := GeometryTest.cpp MathTest.cpp MatrixTest.cpp PackBitsTest.cpp \
|
||||
Sk64Test.cpp StringTest.cpp Test.cpp UtilsTest.cpp PathTest.cpp \
|
||||
ClipCubicTest.cpp SrcOverTest.cpp StreamTest.cpp SortTest.cpp \
|
||||
BitmapCopyTest.cpp PathMeasureTest.cpp TriangulationTest.cpp \
|
||||
testmain.cpp
|
||||
TestSize.cpp testmain.cpp
|
||||
|
||||
TESTS_SRCS := $(addprefix tests/, $(TESTS_SRCS))
|
||||
|
||||
|
77
include/core/SkSize.h
Normal file
77
include/core/SkSize.h
Normal file
@ -0,0 +1,77 @@
|
||||
|
||||
|
||||
#ifndef SkSize_DEFINED
|
||||
#define SkSize_DEFINED
|
||||
|
||||
template <typename T> struct SkTSize {
|
||||
T fWidth;
|
||||
T fHeight;
|
||||
|
||||
void set(T w, T h) {
|
||||
fWidth = w;
|
||||
fHeight = h;
|
||||
}
|
||||
|
||||
/** Returns true if either widht or height are <= 0 */
|
||||
bool isEmpty() const {
|
||||
return fWidth <= 0 || fHeight <= 0;
|
||||
}
|
||||
|
||||
/** Set the width and height to 0 */
|
||||
void setEmpty() {
|
||||
fWidth = fHeight = 0;
|
||||
}
|
||||
|
||||
/** If width or height is < 0, it is set to 0 */
|
||||
void clampNegToZero() {
|
||||
if (fWidth < 0) {
|
||||
fWidth = 0;
|
||||
}
|
||||
if (fHeight < 0) {
|
||||
fHeight = 0;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
static inline bool operator==(const SkTSize<T>& a, const SkTSize<T>& b) {
|
||||
return a.fWidth == b.fWidth && a.fHeight == b.fHeight;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static inline bool operator!=(const SkTSize<T>& a, const SkTSize<T>& b) {
|
||||
return !(a == b);
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
struct SkISize : public SkTSize<int32_t> {};
|
||||
|
||||
#include "SkScalar.h"
|
||||
|
||||
struct SkSize : public SkTSize<SkScalar> {
|
||||
SkSize& operator=(const SkISize& src) {
|
||||
this->set(SkIntToScalar(src.fWidth), SkIntToScalar(src.fHeight));
|
||||
return *this;
|
||||
}
|
||||
|
||||
SkISize round() const {
|
||||
SkISize s;
|
||||
s.set(SkScalarRound(fWidth), SkScalarRound(fHeight));
|
||||
return s;
|
||||
}
|
||||
|
||||
SkISize ceil() const {
|
||||
SkISize s;
|
||||
s.set(SkScalarCeil(fWidth), SkScalarCeil(fHeight));
|
||||
return s;
|
||||
}
|
||||
|
||||
SkISize floor() const {
|
||||
SkISize s;
|
||||
s.set(SkScalarFloor(fWidth), SkScalarFloor(fHeight));
|
||||
return s;
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
60
tests/TestSize.cpp
Normal file
60
tests/TestSize.cpp
Normal file
@ -0,0 +1,60 @@
|
||||
#include "Test.h"
|
||||
#include "SkSize.h"
|
||||
|
||||
static void TestISize(skiatest::Reporter* reporter) {
|
||||
SkISize a, b;
|
||||
|
||||
a.set(0, 0);
|
||||
REPORTER_ASSERT(reporter, a.isEmpty());
|
||||
a.set(5, -5);
|
||||
REPORTER_ASSERT(reporter, a.isEmpty());
|
||||
a.clampNegToZero();
|
||||
REPORTER_ASSERT(reporter, a.isEmpty());
|
||||
b.set(5, 0);
|
||||
REPORTER_ASSERT(reporter, a == b);
|
||||
|
||||
a.set(3, 5);
|
||||
REPORTER_ASSERT(reporter, !a.isEmpty());
|
||||
b = a;
|
||||
REPORTER_ASSERT(reporter, !b.isEmpty());
|
||||
REPORTER_ASSERT(reporter, a == b);
|
||||
REPORTER_ASSERT(reporter, !(a != b));
|
||||
REPORTER_ASSERT(reporter,
|
||||
a.fWidth == b.fWidth && a.fHeight == b.fHeight);
|
||||
}
|
||||
|
||||
static void TestSize(skiatest::Reporter* reporter) {
|
||||
TestISize(reporter);
|
||||
|
||||
SkSize a, b;
|
||||
int ix = 5;
|
||||
int iy = 3;
|
||||
SkScalar x = SkIntToScalar(ix);
|
||||
SkScalar y = SkIntToScalar(iy);
|
||||
|
||||
a.set(0, 0);
|
||||
REPORTER_ASSERT(reporter, a.isEmpty());
|
||||
a.set(x, -x);
|
||||
REPORTER_ASSERT(reporter, a.isEmpty());
|
||||
a.clampNegToZero();
|
||||
REPORTER_ASSERT(reporter, a.isEmpty());
|
||||
b.set(x, 0);
|
||||
REPORTER_ASSERT(reporter, a == b);
|
||||
|
||||
a.set(y, x);
|
||||
REPORTER_ASSERT(reporter, !a.isEmpty());
|
||||
b = a;
|
||||
REPORTER_ASSERT(reporter, !b.isEmpty());
|
||||
REPORTER_ASSERT(reporter, a == b);
|
||||
REPORTER_ASSERT(reporter, !(a != b));
|
||||
REPORTER_ASSERT(reporter,
|
||||
a.fWidth == b.fWidth && a.fHeight == b.fHeight);
|
||||
|
||||
SkISize ia;
|
||||
ia.set(ix, iy);
|
||||
a.set(x, y);
|
||||
REPORTER_ASSERT(reporter, a.round() == ia);
|
||||
};
|
||||
|
||||
#include "TestClassDef.h"
|
||||
DEFINE_TESTCLASS("Size", TestSizeClass, TestSize)
|
Loading…
Reference in New Issue
Block a user