Project import generated by Copybara.

PiperOrigin-RevId: 267280553
This commit is contained in:
MediaPipe Team
2019-09-04 19:11:29 -07:00
committed by jqtang
parent af67642055
commit dc9216dc59
57 changed files with 0 additions and 582 deletions
@@ -244,11 +244,7 @@ REGISTER_CALCULATOR(ImageTransformationCalculator);
rotation_ = DegreesToRotationMode(
cc->InputSidePackets().Tag("ROTATION_DEGREES").Get<int>());
} else {
<<<<<<< HEAD
rotation_ = DegreesToRotationMode(options_.rotation_mode());
=======
rotation_ = options_.rotation_mode();
>>>>>>> Project import generated by Copybara.
}
scale_mode_ = ParseScaleMode(options_.scale_mode(), DEFAULT_SCALE_MODE);