DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update enum name.

Browse Source
This commit is contained in:
Chinmay Garde 2021-07-08 17:53:42 -07:00 committed by Dan Field
parent 8513b51bf1
commit 16699789ca
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/src/flutter/impeller/compositor/texture_descriptor.mm
View File

@ -6,18 +6,17 @@
namespace impeller {
std::optional<PixelFormat> FormatForImageResultComponents(
Image::Components comp) {
std::optional<PixelFormat> FormatForImageResultComponents(Image::Format comp) {
switch (comp) {
case Image::Components::Invalid:
case Image::Format::Invalid:
return std::nullopt;
case Image::Components::Grey:
case Image::Format::Grey:
return std::nullopt;
case Image::Components::GreyAlpha:
case Image::Format::GreyAlpha:
return std::nullopt;
case Image::Components::RGB:
case Image::Format::RGB:
return std::nullopt;
case Image::Components::RGBA:
case Image::Format::RGBA:
return PixelFormat::kPixelFormat_R8G8B8A8_UNormInt;
}
return std::nullopt;

14
engine/src/flutter/impeller/image/compressed_image.cc
View File

@ -47,27 +47,27 @@ Image CompressedImage::Decode() const {
/*
* Make sure we got a valid component set.
*/
auto components = Image::Components::Invalid;
auto components = Image::Format::Invalid;
switch (comps) {
case STBI_grey:
components = Image::Components::Grey;
components = Image::Format::Grey;
break;
case STBI_grey_alpha:
components = Image::Components::GreyAlpha;
components = Image::Format::GreyAlpha;
break;
case STBI_rgb:
components = Image::Components::RGB;
components = Image::Format::RGB;
break;
case STBI_rgb_alpha:
components = Image::Components::RGBA;
components = Image::Format::RGBA;
break;
default:
components = Image::Components::Invalid;
components = Image::Format::Invalid;
break;
}
if (components == Image::Components::Invalid) {
if (components == Image::Format::Invalid) {
FML_LOG(ERROR) << "Could not detect image components when decoding.";
return {};
}

4
engine/src/flutter/impeller/image/image.cc
View File

@ -9,7 +9,7 @@ namespace impeller {
Image::Image() = default;
Image::Image(ISize size,
Components components,
Format components,
std::shared_ptr<const fml::Mapping> allocation)
: size_(size), components_(components), allocation_(std::move(allocation)) {
if (!allocation_ || !size.IsPositive()) {
@ -28,7 +28,7 @@ const ISize& Image::GetSize() const {
return size_;
}
Image::Components Image::GetComponents() const {
Image::Format Image::GetComponents() const {
return components_;
}

8
engine/src/flutter/impeller/image/image.h
View File

@ -14,7 +14,7 @@ namespace impeller {
class Image {
public:
enum class Components {
enum class Format {
Invalid,
Grey,
GreyAlpha,
@ -25,7 +25,7 @@ class Image {
Image();
Image(ISize size,
Components components,
Format components,
std::shared_ptr<const fml::Mapping> allocation);
~Image();
@ -34,13 +34,13 @@ class Image {
bool IsValid() const;
Components GetComponents() const;
Format GetComponents() const;
const std::shared_ptr<const fml::Mapping>& GetAllocation() const;
private:
ISize size_;
Components components_ = Components::Invalid;
Format components_ = Format::Invalid;
std::shared_ptr<const fml::Mapping> allocation_;
bool is_valid_ = false;