# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ==============================================================================

# pylint: disable=g-short-docstring-punctuation
"""Image processing and decoding ops.

See the @{$python/image} guide.
<<<<<<< HEAD
=======

@@decode_bmp
@@decode_gif
@@decode_jpeg
@@decode_and_crop_jpeg
@@encode_jpeg
@@extract_jpeg_shape
@@decode_png
@@encode_png
@@is_jpeg
@@decode_image
@@resize_images
@@resize_area
@@resize_bicubic
@@resize_bilinear
@@resize_nearest_neighbor
@@resize_image_with_crop_or_pad
@@resize_image_with_pad
@@central_crop
@@pad_to_bounding_box
@@crop_to_bounding_box
@@extract_glimpse
@@crop_and_resize
@@flip_up_down
@@random_flip_up_down
@@flip_left_right
@@random_flip_left_right
@@transpose_image
@@rot90

@@rgb_to_grayscale
@@grayscale_to_rgb
@@hsv_to_rgb
@@rgb_to_hsv
@@rgb_to_yiq
@@yiq_to_rgb
@@rgb_to_yuv
@@yuv_to_rgb
@@convert_image_dtype
@@adjust_brightness
@@random_brightness
@@adjust_contrast
@@random_contrast
@@adjust_hue
@@random_hue
@@adjust_gamma
@@adjust_saturation
@@random_saturation
@@per_image_standardization
@@draw_bounding_boxes
@@non_max_suppression
@@sample_distorted_bounding_box
@@total_variation
@@psnr
@@ssim
@@ssim_multiscale
@@image_gradients
@@sobel_edges
>>>>>>> 88687fa... Add resize_image_aspect_with_pad method
"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function


# go/tf-wildcard-import
# pylint: disable=wildcard-import
from tensorflow.python.ops.gen_image_ops import *
from tensorflow.python.ops.image_ops_impl import *
# pylint: enable=wildcard-import

# TODO(drpng): remove these once internal use has discontinued.
# pylint: disable=unused-import
from tensorflow.python.ops.image_ops_impl import _Check3DImage
from tensorflow.python.ops.image_ops_impl import _ImageDimensions
# pylint: enable=unused-import

@@ -806,1069 +806,8 @@
 de.%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A=======%0A%0A@@decode_bmp%0A@@decode_gif%0A@@decode_jpeg%0A@@decode_and_crop_jpeg%0A@@encode_jpeg%0A@@extract_jpeg_shape%0A@@decode_png%0A@@encode_png%0A@@is_jpeg%0A@@decode_image%0A@@resize_images%0A@@resize_area%0A@@resize_bicubic%0A@@resize_bilinear%0A@@resize_nearest_neighbor%0A@@resize_image_with_crop_or_pad%0A@@resize_image_with_pad%0A@@central_crop%0A@@pad_to_bounding_box%0A@@crop_to_bounding_box%0A@@extract_glimpse%0A@@crop_and_resize%0A@@flip_up_down%0A@@random_flip_up_down%0A@@flip_left_right%0A@@random_flip_left_right%0A@@transpose_image%0A@@rot90%0A%0A@@rgb_to_grayscale%0A@@grayscale_to_rgb%0A@@hsv_to_rgb%0A@@rgb_to_hsv%0A@@rgb_to_yiq%0A@@yiq_to_rgb%0A@@rgb_to_yuv%0A@@yuv_to_rgb%0A@@convert_image_dtype%0A@@adjust_brightness%0A@@random_brightness%0A@@adjust_contrast%0A@@random_contrast%0A@@adjust_hue%0A@@random_hue%0A@@adjust_gamma%0A@@adjust_saturation%0A@@random_saturation%0A@@per_image_standardization%0A@@draw_bounding_boxes%0A@@non_max_suppression%0A@@sample_distorted_bounding_box%0A@@total_variation%0A@@psnr%0A@@ssim%0A@@ssim_multiscale%0A@@image_gradients%0A@@sobel_edges%0A%3E%3E%3E%3E%3E%3E%3E 88687fa... Add resize_image_aspect_with_pad method%0A
 %22%22%22%0A

Fix bad merge