Index: media/base/video_color_space.cc |
diff --git a/media/base/video_color_space.cc b/media/base/video_color_space.cc |
index 036cd57f92050a4d55eaccd4fdc0fbc3c7bf7c88..861bbb9891606e539595502a8f3e93a466ec4669 100644 |
--- a/media/base/video_color_space.cc |
+++ b/media/base/video_color_space.cc |
@@ -41,7 +41,11 @@ VideoColorSpace::VideoColorSpace(int primaries, |
: primaries(GetPrimaryID(primaries)), |
transfer(GetTransferID(transfer)), |
matrix(GetMatrixID(matrix)), |
- range(range) {} |
+ range(range) { |
+ primaries_union.primaries = GetPrimaryID(primaries); |
+ transfer_union.transfer = GetTransferID(transfer); |
+ matrix_union.matrix = GetMatrixID(matrix); |
+} |
bool VideoColorSpace::operator==(const VideoColorSpace& other) const { |
return primaries == other.primaries && transfer == other.transfer && |
@@ -54,10 +58,9 @@ bool VideoColorSpace::operator!=(const VideoColorSpace& other) const { |
} |
gfx::ColorSpace VideoColorSpace::ToGfxColorSpace() const { |
- // TODO(hubbe): Make this type-safe. |
- return gfx::ColorSpace::CreateVideo(static_cast<int>(primaries), |
- static_cast<int>(transfer), |
- static_cast<int>(matrix), range); |
+ return gfx::ColorSpace::CreateVideo(primaries_union.primary_id, |
+ transfer_union.transfer_id, |
+ matrix_union.matrix_id, range); |
} |
VideoColorSpace VideoColorSpace::REC709() { |