drm_hwcomposer: fix spelling of "separate".

It is spelled "separate", not "seperate".

Change-Id: Id92d12aba42989a8a72e4596d425b2a9eea4e5ec

diff --git a/Android.mk b/Android.mk
index 810caac..ca94f4c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -38,20 +38,20 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_SRC_FILES := \
        drmresources.cpp \
-        drmcomposition.cpp \
-        drmcompositor.cpp \
-        drmcompositorworker.cpp \
+       drmcomposition.cpp \
+       drmcompositor.cpp \
+       drmcompositorworker.cpp \
        drmconnector.cpp \
        drmcrtc.cpp \
-        drmdisplaycomposition.cpp \
-        drmdisplaycompositor.cpp \
+       drmdisplaycomposition.cpp \
+       drmdisplaycompositor.cpp \
        drmencoder.cpp \
        drmmode.cpp \
        drmplane.cpp \
        drmproperty.cpp \
        glworker.cpp \
        hwcomposer.cpp \
-       seperate_rects.cpp \
+       separate_rects.cpp \
        virtualcompositorworker.cpp \
        vsyncworker.cpp \
        worker.cpp

diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index 34d879e..e712b64 100644 (file)
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -191,11 +191,11 @@ static void SeparateLayers(DrmHwcLayer *layers, size_t *used_layers,
       layer_rects.begin() + num_exclude_rects,
       [=](size_t layer_index) { return layers[layer_index].display_frame; });
 
-  std::vector<seperate_rects::RectSet<uint64_t, int>> seperate_regions;
-  seperate_rects::seperate_rects_64(layer_rects, &seperate_regions);
+  std::vector<separate_rects::RectSet<uint64_t, int>> separate_regions;
+  separate_rects::separate_rects_64(layer_rects, &separate_regions);
   uint64_t exclude_mask = ((uint64_t)1 << num_exclude_rects) - 1;
 
-  for (seperate_rects::RectSet<uint64_t, int> &region : seperate_regions) {
+  for (separate_rects::RectSet<uint64_t, int> &region : separate_regions) {
     if (region.id_set.getBits() & exclude_mask)
       continue;
     regions.emplace_back(DrmCompositionRegion{

diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index 44c751d..e51d932 100644 (file)
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -52,10 +52,10 @@ void SquashState::Init(DrmHwcLayer *layers, size_t num_layers) {
     last_handles_.push_back(layer->sf_handle);
   }
 
-  std::vector<seperate_rects::RectSet<uint64_t, int>> out_regions;
-  seperate_rects::seperate_rects_64(in_rects, &out_regions);
+  std::vector<separate_rects::RectSet<uint64_t, int>> out_regions;
+  separate_rects::separate_rects_64(in_rects, &out_regions);
 
-  for (const seperate_rects::RectSet<uint64_t, int> &out_region : out_regions) {
+  for (const separate_rects::RectSet<uint64_t, int> &out_region : out_regions) {
     regions_.emplace_back();
     Region &region = regions_.back();
     region.rect = out_region.rect;

diff --git a/drmdisplaycompositor.h b/drmdisplaycompositor.h
index 7606740..a05284b 100644 (file)
--- a/drmdisplaycompositor.h
+++ b/drmdisplaycompositor.h
@@ -21,7 +21,7 @@
 #include "drmcomposition.h"
 #include "drmcompositorworker.h"
 #include "drmframebuffer.h"
-#include "seperate_rects.h"
+#include "separate_rects.h"
 
 #include <pthread.h>
 #include <memory>

diff --git a/drmhwcomposer.h b/drmhwcomposer.h
index 8508e44..2f36ad8 100644 (file)
--- a/drmhwcomposer.h
+++ b/drmhwcomposer.h
@@ -23,7 +23,7 @@
 #include <hardware/hardware.h>
 #include <hardware/hwcomposer.h>
 #include "autofd.h"
-#include "seperate_rects.h"
+#include "separate_rects.h"
 #include "drmhwcgralloc.h"
 
 struct hwc_import_context;
@@ -117,7 +117,7 @@ class DrmHwcNativeHandle {
 };
 
 template <typename T>
-using DrmHwcRect = seperate_rects::Rect<T>;
+using DrmHwcRect = separate_rects::Rect<T>;
 
 enum class DrmHwcTransform : uint32_t {
   kIdentity = 0,

diff --git a/seperate_rects.cpp b/separate_rects.cpp
similarity index 97%
rename from seperate_rects.cpp
rename to separate_rects.cpp
index 9344873..3d76e53 100644 (file)
--- a/seperate_rects.cpp
+++ b/separate_rects.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "seperate_rects.h"
+#include "separate_rects.h"
 #include <algorithm>
 #include <assert.h>
 #include <iostream>
@@ -23,7 +23,7 @@
 #include <utility>
 #include <vector>
 
-namespace seperate_rects {
+namespace separate_rects {
 
 enum EventType { START, END };
 
@@ -71,7 +71,7 @@ std::ostream &operator<<(std::ostream &os, const IdSet<TUInt> &obj) {
 }
 
 template <typename TNum, typename TId>
-void seperate_rects(const std::vector<Rect<TNum>> &in,
+void separate_rects(const std::vector<Rect<TNum>> &in,
                     std::vector<RectSet<TId, TNum>> *out) {
   // Overview:
   // This algorithm is a line sweep algorithm that travels from left to right.
@@ -304,21 +304,21 @@ void seperate_rects(const std::vector<Rect<TNum>> &in,
   }
 }
 
-void seperate_frects_64(const std::vector<Rect<float>> &in,
+void separate_frects_64(const std::vector<Rect<float>> &in,
                         std::vector<RectSet<uint64_t, float>> *out) {
-  seperate_rects(in, out);
+  separate_rects(in, out);
 }
 
-void seperate_rects_64(const std::vector<Rect<int>> &in,
+void separate_rects_64(const std::vector<Rect<int>> &in,
                        std::vector<RectSet<uint64_t, int>> *out) {
-  seperate_rects(in, out);
+  separate_rects(in, out);
 }
 
-}  // namespace seperate_rects
+}  // namespace separate_rects
 
 #ifdef RECTS_TEST
 
-using namespace seperate_rects;
+using namespace separate_rects;
 
 int main(int argc, char **argv) {
 #define RectSet RectSet<TId, TNum>
@@ -358,7 +358,7 @@ int main(int argc, char **argv) {
 
   for (int i = 0; i < 100000; i++) {
     out.clear();
-    seperate_rects(in, &out);
+    separate_rects(in, &out);
   }
 
   for (int i = 0; i < out.size(); i++) {

diff --git a/seperate_rects.h b/separate_rects.h
similarity index 91%
rename from seperate_rects.h
rename to separate_rects.h
index 0703c97..de8b660 100644 (file)
--- a/seperate_rects.h
+++ b/separate_rects.h
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#ifndef DRM_HWCOMPOSER_SEPERATE_RECTS_H_
-#define DRM_HWCOMPOSER_SEPERATE_RECTS_H_
+#ifndef DRM_HWCOMPOSER_SEPARATE_RECTS_H_
+#define DRM_HWCOMPOSER_SEPARATE_RECTS_H_
 
 #include <stdint.h>
 
 #include <sstream>
 #include <vector>
 
-namespace seperate_rects {
+namespace separate_rects {
 
 template <typename TFloat>
 struct Rect {
@@ -153,17 +153,17 @@ struct RectSet {
   }
 };
 
-// Seperates up to a maximum of 64 input rectangles into mutually non-
+// Separates up to a maximum of 64 input rectangles into mutually non-
 // overlapping rectangles that cover the exact same area and outputs those non-
 // overlapping rectangles. Each output rectangle also includes the set of input
 // rectangle indices that overlap the output rectangle encoded in a bitset. For
 // example, an output rectangle that overlaps input rectangles in[0], in[1], and
 // in[4], the bitset would be (ommitting leading zeroes) 10011.
-void seperate_frects_64(const std::vector<Rect<float>> &in,
+void separate_frects_64(const std::vector<Rect<float>> &in,
                         std::vector<RectSet<uint64_t, float>> *out);
-void seperate_rects_64(const std::vector<Rect<int>> &in,
+void separate_rects_64(const std::vector<Rect<int>> &in,
                        std::vector<RectSet<uint64_t, int>> *out);
 
-}  // namespace seperate_rects
+}  // namespace separate_rects
 
 #endif