summaryrefslogtreecommitdiff
path: root/src/mbgl/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/util')
-rw-r--r--src/mbgl/util/rect.hpp1
-rw-r--r--src/mbgl/util/scaling.cpp112
-rw-r--r--src/mbgl/util/scaling.hpp23
3 files changed, 0 insertions, 136 deletions
diff --git a/src/mbgl/util/rect.hpp b/src/mbgl/util/rect.hpp
index 7bb3214b9b..1dc8cb8af9 100644
--- a/src/mbgl/util/rect.hpp
+++ b/src/mbgl/util/rect.hpp
@@ -9,7 +9,6 @@ struct Rect {
inline Rect(T x_, T y_, T w_, T h_) : x(x_), y(y_), w(w_), h(h_) {}
T x = 0, y = 0;
T w = 0, h = 0;
- T originalW = 0, originalH = 0;
template <typename Number>
inline Rect operator *(Number value) const {
diff --git a/src/mbgl/util/scaling.cpp b/src/mbgl/util/scaling.cpp
deleted file mode 100644
index 9b32650511..0000000000
--- a/src/mbgl/util/scaling.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "scaling.hpp"
-
-namespace {
-
-using namespace mbgl;
-
-inline uint8_t bilinearInterpolate(uint8_t tl, uint8_t tr, uint8_t bl, uint8_t br, double dx, double dy) {
- const double t = dx * (tr - tl) + tl;
- const double b = dx * (br - bl) + bl;
- return t + dy * (b - t);
-}
-
-template <size_t i>
-inline const uint8_t& b(const uint32_t& w) {
- return reinterpret_cast<const uint8_t*>(&w)[i];
-}
-
-template <size_t i>
-inline uint8_t& b(uint32_t& w) {
- return reinterpret_cast<uint8_t*>(&w)[i];
-}
-
-vec2<double> getFactor(const Rect<uint32_t>& srcPos, const Rect<uint32_t>& dstPos) {
- return {
- double(srcPos.w) / dstPos.w,
- double(srcPos.h) / dstPos.h
- };
-}
-
-vec2<uint32_t> getBounds(const vec2<uint32_t>& srcSize, const Rect<uint32_t>& srcPos,
- const vec2<uint32_t>& dstSize, const Rect<uint32_t>& dstPos,
- const vec2<double>& factor) {
- if (srcPos.x > srcSize.x || srcPos.y > srcSize.y ||
- dstPos.x > dstSize.x || dstPos.y > dstSize.y) {
- // Source or destination position is out of range.
- return { 0, 0 };
- }
-
- // Make sure we don't read/write values out of range.
- return { std::min(uint32_t(double(srcSize.x - srcPos.x) / factor.x),
- std::min(dstSize.x - dstPos.x, dstPos.w)),
- std::min(uint32_t(double(srcSize.y - srcPos.y) / factor.y),
- std::min(dstSize.y - dstPos.y, dstPos.h)) };
-}
-} // namespace
-
-namespace mbgl {
-namespace util {
-
-void bilinearScale(const uint32_t* srcData, const vec2<uint32_t>& srcSize,
- const Rect<uint32_t>& srcPos, uint32_t* dstData, const vec2<uint32_t>& dstSize,
- const Rect<uint32_t>& dstPos, bool wrap) {
- const auto factor = getFactor(srcPos, dstPos);
- const auto bounds = getBounds(srcSize, srcPos, dstSize, dstPos, factor);
-
- uint32_t x, y;
- size_t i = dstSize.x * dstPos.y + dstPos.x;
- for (y = 0; y < bounds.y; y++) {
- const double fractY = y * factor.y;
- const uint32_t Y0 = fractY;
- const uint32_t Y1 = wrap ? (Y0 + 1) % srcPos.h : (Y0 + 1);
- const uint32_t srcY0 = srcPos.y + Y0;
- const uint32_t srcY1 = std::min(srcPos.y + Y1, srcSize.y - 1);
- for (x = 0; x < bounds.x; x++) {
- const double fractX = x * factor.x;
- const uint32_t X0 = fractX;
- const uint32_t X1 = wrap ? (X0 + 1) % srcPos.w : (X0 + 1);
- const uint32_t srcX0 = srcPos.x + X0;
- const uint32_t srcX1 = std::min(srcPos.x + X1, srcSize.x - 1);
-
- const uint32_t tl = srcData[srcSize.x * srcY0 + srcX0];
- const uint32_t tr = srcData[srcSize.x * srcY0 + srcX1];
- const uint32_t bl = srcData[srcSize.x * srcY1 + srcX0];
- const uint32_t br = srcData[srcSize.x * srcY1 + srcX1];
-
- const double dx = fractX - X0;
- const double dy = fractY - Y0;
- uint32_t& dst = dstData[i + x];
- b<0>(dst) = bilinearInterpolate(b<0>(tl), b<0>(tr), b<0>(bl), b<0>(br), dx, dy);
- b<1>(dst) = bilinearInterpolate(b<1>(tl), b<1>(tr), b<1>(bl), b<1>(br), dx, dy);
- b<2>(dst) = bilinearInterpolate(b<2>(tl), b<2>(tr), b<2>(bl), b<2>(br), dx, dy);
- b<3>(dst) = bilinearInterpolate(b<3>(tl), b<3>(tr), b<3>(bl), b<3>(br), dx, dy);
- }
- i += dstSize.x;
- }
-}
-
-void nearestNeighborScale(const uint32_t* srcData, const vec2<uint32_t>& srcSize,
- const Rect<uint32_t>& srcPos, uint32_t* dstData,
- const vec2<uint32_t>& dstSize, const Rect<uint32_t>& dstPos) {
- const auto factor = getFactor(srcPos, dstPos);
- const auto bounds = getBounds(srcSize, srcPos, dstSize, dstPos, factor);
-
- double fractSrcY = srcPos.y;
- double fractSrcX;
- size_t i = dstSize.x * dstPos.y + dstPos.x;
- uint32_t srcY;
- uint32_t x, y;
- for (y = 0; y < bounds.y; y++) {
- fractSrcX = srcPos.x;
- srcY = srcSize.x * uint32_t(fractSrcY);
- for (x = 0; x < bounds.x; x++) {
- dstData[i + x] = srcData[srcY + uint32_t(fractSrcX)];
- fractSrcX += factor.x;
- }
- i += dstSize.x;
- fractSrcY += factor.y;
- }
-}
-
-} // namespace util
-} // namespace mbgl
diff --git a/src/mbgl/util/scaling.hpp b/src/mbgl/util/scaling.hpp
deleted file mode 100644
index a2d582de1c..0000000000
--- a/src/mbgl/util/scaling.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef MBGL_UTIL_SCALING
-#define MBGL_UTIL_SCALING
-
-
-#include <mbgl/util/vec.hpp>
-#include <mbgl/util/rect.hpp>
-
-#include <cstdint>
-
-namespace mbgl {
-namespace util {
-
-void bilinearScale(const uint32_t* srcData, const vec2<uint32_t>& srcSize,
- const Rect<uint32_t>& srcPos, uint32_t* dstData, const vec2<uint32_t>& dstSize,
- const Rect<uint32_t>& dstPos, bool wrap);
-
-void nearestNeighborScale(const uint32_t* srcData, const vec2<uint32_t>& srcSize,
- const Rect<uint32_t>& srcPos, uint32_t* dstData,
- const vec2<uint32_t>& dstSize, const Rect<uint32_t>& dstPos);
-} // namespace util
-} // namespace mbgl
-
-#endif
View Lorry Controller Status