diff options
| author | Tianwei Shen <shentianweipku@gmail.com> | 2017-03-09 15:27:36 +0300 |
|---|---|---|
| committer | Tianwei Shen <shentianweipku@gmail.com> | 2017-03-09 15:27:36 +0300 |
| commit | bb332043f0fb85bb9bcf3556b1f84f9dc1ebdb98 (patch) | |
| tree | fbacf1f24d5e60883da7841f5da6acbb441f7857 /source/gameengine/VideoTexture/FilterColor.h | |
| parent | 459d429fec1c007b6a80e792a43cd99c5db2656e (diff) | |
| parent | 4ab322fdd2e019ba337b2560a2d36f2175c03a32 (diff) | |
Merge branch 'master' into soc-2016-multiview
Diffstat (limited to 'source/gameengine/VideoTexture/FilterColor.h')
| -rw-r--r-- | source/gameengine/VideoTexture/FilterColor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/VideoTexture/FilterColor.h b/source/gameengine/VideoTexture/FilterColor.h index 350f7270874..d042863d7e8 100644 --- a/source/gameengine/VideoTexture/FilterColor.h +++ b/source/gameengine/VideoTexture/FilterColor.h @@ -36,7 +36,7 @@ #include "FilterBase.h" -/// pixel filter for gray scale +/// pixel filter for grayscale class FilterGray : public FilterBase { public: @@ -53,7 +53,7 @@ protected: // calculate gray value unsigned int gray = (28 * (VT_B(val)) + 151 * (VT_G(val)) + 77 * (VT_R(val))) >> 8; - // return gray scale value + // return grayscale value VT_R(val) = gray; VT_G(val) = gray; VT_B(val) = gray; |