diff options
Diffstat (limited to 'ui/gfx/image')
| -rw-r--r-- | ui/gfx/image/image.h | 4 | ||||
| -rw-r--r-- | ui/gfx/image/image_util.h | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h index 6f6d161..c9aff41 100644 --- a/ui/gfx/image/image.h +++ b/ui/gfx/image/image.h @@ -23,8 +23,8 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" +#include "ui/base/ui_export.h" #include "ui/gfx/native_widget_types.h" -#include "ui/ui_api.h" class SkBitmap; @@ -40,7 +40,7 @@ class ImageRep; class ImageStorage; } -class UI_API Image { +class UI_EXPORT Image { public: enum RepresentationType { kImageRepGdk, diff --git a/ui/gfx/image/image_util.h b/ui/gfx/image/image_util.h index 6e1d803..92f9224 100644 --- a/ui/gfx/image/image_util.h +++ b/ui/gfx/image/image_util.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "ui/ui_api.h" +#include "ui/base/ui_export.h" namespace gfx { class Image; @@ -19,18 +19,18 @@ namespace gfx { // Creates an image from the given PNG-encoded input. The caller owns the // returned Image. If there was an error creating the image, returns NULL. -UI_API Image* ImageFromPNGEncodedData(const unsigned char* input, - size_t input_size); +UI_EXPORT Image* ImageFromPNGEncodedData(const unsigned char* input, + size_t input_size); // Fills the |dst| vector with PNG-encoded bytes based on the given Image. // Returns true if the Image was encoded successfully. -UI_API bool PNGEncodedDataFromImage(const Image& image, - std::vector<unsigned char>* dst); +UI_EXPORT bool PNGEncodedDataFromImage(const Image& image, + std::vector<unsigned char>* dst); // Fills the |dst| vector with JPEG-encoded bytes based on the given Image. // Returns true if the Image was encoded successfully. -UI_API bool JPEGEncodedDataFromImage(const Image& image, - std::vector<unsigned char>* dst); +UI_EXPORT bool JPEGEncodedDataFromImage(const Image& image, + std::vector<unsigned char>* dst); } |