From 7a94e0c73fa4174c651f722c4480553efe66fbbe Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Mon, 16 Apr 2018 16:20:48 -0700 Subject: [PATCH] Fix broken Linux build (flutter/engine#5019) After we write the pixels in the correct format, the color type of the SkPixmap is still set to its previous value, so the existing assertion was failing. --- engine/src/flutter/.gitignore | 1 + engine/src/flutter/lib/ui/painting/image_encoding.cc | 1 - engine/src/flutter/testing/dart/.gitignore | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/engine/src/flutter/.gitignore b/engine/src/flutter/.gitignore index b5f80bd40a..2e1362f0aa 100644 --- a/engine/src/flutter/.gitignore +++ b/engine/src/flutter/.gitignore @@ -5,6 +5,7 @@ .DS_Store .classpath .cproject +.dart_tool .gdb_history .checkstyle .gdbinit diff --git a/engine/src/flutter/lib/ui/painting/image_encoding.cc b/engine/src/flutter/lib/ui/painting/image_encoding.cc index 15d2d31c9e..c103d5d827 100644 --- a/engine/src/flutter/lib/ui/painting/image_encoding.cc +++ b/engine/src/flutter/lib/ui/painting/image_encoding.cc @@ -79,7 +79,6 @@ sk_sp GetImageBytesAsRGBA(sk_sp image) { FXL_LOG(ERROR) << "Pixel address is not available."; return nullptr; } - ASSERT(pixmap.colorType() == kRGBA_8888_SkColorType); const size_t pixmap_size = pixmap.computeByteSize(); return SkData::MakeWithCopy(pixmap.addr32(), pixmap_size); diff --git a/engine/src/flutter/testing/dart/.gitignore b/engine/src/flutter/testing/dart/.gitignore index 79f51c3d50..93d2a1eaed 100644 --- a/engine/src/flutter/testing/dart/.gitignore +++ b/engine/src/flutter/testing/dart/.gitignore @@ -1,3 +1,2 @@ -.dart_tool .packages pubspec.lock