Bug 1205521 - Part4: (v2) Align LayerScopePacket to fit changes in Bug 1211324. r=dglastonbury

This commit is contained in:
Jeremy Chen 2015-10-18 20:37:00 +02:00
parent 6e9740b20a
commit 1952866500
3 changed files with 18 additions and 8 deletions

View File

@ -2477,6 +2477,8 @@ bool LayersPacket_Layer_Filter_IsValid(int value) {
case 4:
case 5:
case 6:
case 7:
case 8:
return true;
default:
return false;
@ -2491,6 +2493,8 @@ const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_NEAREST;
const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_BILINEAR;
const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_GAUSSIAN;
const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_SENTINEL;
const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_LINEAR;
const LayersPacket_Layer_Filter LayersPacket_Layer::FILTER_POINT;
const LayersPacket_Layer_Filter LayersPacket_Layer::Filter_MIN;
const LayersPacket_Layer_Filter LayersPacket_Layer::Filter_MAX;
const int LayersPacket_Layer::Filter_ARRAYSIZE;

View File

@ -96,11 +96,13 @@ enum LayersPacket_Layer_Filter {
LayersPacket_Layer_Filter_FILTER_NEAREST = 3,
LayersPacket_Layer_Filter_FILTER_BILINEAR = 4,
LayersPacket_Layer_Filter_FILTER_GAUSSIAN = 5,
LayersPacket_Layer_Filter_FILTER_SENTINEL = 6
LayersPacket_Layer_Filter_FILTER_SENTINEL = 6,
LayersPacket_Layer_Filter_FILTER_LINEAR = 7,
LayersPacket_Layer_Filter_FILTER_POINT = 8
};
bool LayersPacket_Layer_Filter_IsValid(int value);
const LayersPacket_Layer_Filter LayersPacket_Layer_Filter_Filter_MIN = LayersPacket_Layer_Filter_FILTER_FAST;
const LayersPacket_Layer_Filter LayersPacket_Layer_Filter_Filter_MAX = LayersPacket_Layer_Filter_FILTER_SENTINEL;
const LayersPacket_Layer_Filter LayersPacket_Layer_Filter_Filter_MAX = LayersPacket_Layer_Filter_FILTER_POINT;
const int LayersPacket_Layer_Filter_Filter_ARRAYSIZE = LayersPacket_Layer_Filter_Filter_MAX + 1;
enum Packet_DataType {
@ -1704,6 +1706,8 @@ class LayersPacket_Layer : public ::google::protobuf::MessageLite {
static const Filter FILTER_BILINEAR = LayersPacket_Layer_Filter_FILTER_BILINEAR;
static const Filter FILTER_GAUSSIAN = LayersPacket_Layer_Filter_FILTER_GAUSSIAN;
static const Filter FILTER_SENTINEL = LayersPacket_Layer_Filter_FILTER_SENTINEL;
static const Filter FILTER_LINEAR = LayersPacket_Layer_Filter_FILTER_LINEAR;
static const Filter FILTER_POINT = LayersPacket_Layer_Filter_FILTER_POINT;
static inline bool Filter_IsValid(int value) {
return LayersPacket_Layer_Filter_IsValid(value);
}

View File

@ -85,13 +85,15 @@ message LayersPacket {
HORIZONTAL = 2;
}
enum Filter {
FILTER_FAST = 0;
FILTER_FAST = 0; // deprecated
FILTER_GOOD = 1;
FILTER_BEST = 2;
FILTER_NEAREST = 3;
FILTER_BILINEAR = 4;
FILTER_GAUSSIAN = 5;
FILTER_SENTINEL = 6;
FILTER_BEST = 2; // deprecated
FILTER_NEAREST = 3; //deprecated
FILTER_BILINEAR = 4; //deprecated
FILTER_GAUSSIAN = 5; //deprecated
FILTER_SENTINEL = 6; //deprecated
FILTER_LINEAR = 7;
FILTER_POINT = 8;
}
message Size {
optional int32 w = 1;