Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: src/core/SkPMFloat.h

Issue 1324743002: Clean up remaining users of SkPMFloat (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: scale_rgb Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bench/Sk4fBench.cpp ('k') | src/core/SkXfermode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPMFloat.h
diff --git a/src/core/SkPMFloat.h b/src/core/SkPMFloat.h
deleted file mode 100644
index 4a2235dd75867b156d3a026b8559923aaf929fd2..0000000000000000000000000000000000000000
--- a/src/core/SkPMFloat.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkPM_DEFINED
-#define SkPM_DEFINED
-
-#include "SkTypes.h"
-#include "SkColor.h"
-#include "SkColorPriv.h"
-#include "SkNx.h"
-
-// This file may be included multiple times by .cpp files with different flags, leading
-// to different definitions. Usually that doesn't matter because it's all inlined, but
-// in Debug modes the compilers may not inline everything. So wrap everything in an
-// anonymous namespace to give each includer their own silo of this code (or the linker
-// will probably pick one randomly for us, which is rarely correct).
-namespace {
-
-// A pre-multiplied color storing each component in the same order as SkPMColor,
-// but as a float in the range [0, 1].
-class SkPMFloat : public Sk4f {
-public:
- static SkPMFloat FromPMColor(SkPMColor c) { return SkPMFloat(c); }
- static SkPMFloat FromARGB(float a, float r, float g, float b) { return SkPMFloat(a,r,g,b); }
- static SkPMFloat FromOpaqueColor(SkColor c); // Requires c's alpha == 0xFF.
-
- Sk4f alphas() const { return Sk4f(this->a()); }
-
- // Uninitialized.
- SkPMFloat() {}
- explicit SkPMFloat(SkPMColor c) { *this = Sk4f::FromBytes((uint8_t*)&c) * Sk4f(1.0f/255); }
- SkPMFloat(float a, float r, float g, float b)
- #ifdef SK_PMCOLOR_IS_RGBA
- : INHERITED(r,g,b,a) {}
- #else
- : INHERITED(b,g,r,a) {}
- #endif
-
- SkPMFloat(const Sk4f& fs) : INHERITED(fs) {}
-
- float a() const { return this->kth<SK_A32_SHIFT / 8>(); }
- float r() const { return this->kth<SK_R32_SHIFT / 8>(); }
- float g() const { return this->kth<SK_G32_SHIFT / 8>(); }
- float b() const { return this->kth<SK_B32_SHIFT / 8>(); }
-
- SkPMColor round() const {
- SkPMColor c;
- (*this * Sk4f(255) + Sk4f(0.5f)).toBytes((uint8_t*)&c);
- return c;
- }
-
- bool isValid() const {
- return this->a() >= 0 && this->a() <= 1
- && this->r() >= 0 && this->r() <= this->a()
- && this->g() >= 0 && this->g() <= this->a()
- && this->b() >= 0 && this->b() <= this->a();
- }
-
-private:
- typedef Sk4f INHERITED;
-};
-
-} // namespace
-
-#endif//SkPM_DEFINED
« no previous file with comments | « bench/Sk4fBench.cpp ('k') | src/core/SkXfermode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698