Index: chrome/utility/cloud_print/bitmap_image.h |
diff --git a/chrome/utility/cloud_print/bitmap_image.h b/chrome/utility/cloud_print/bitmap_image.h |
index cfa36102e6d176ba7053ea86d285a75152248904..3692755cb206229cf119af330c7a3ce7539b0f1c 100644 |
--- a/chrome/utility/cloud_print/bitmap_image.h |
+++ b/chrome/utility/cloud_print/bitmap_image.h |
@@ -5,6 +5,9 @@ |
#ifndef CHROME_UTILITY_CLOUD_PRINT_BITMAP_IMAGE_H_ |
#define CHROME_UTILITY_CLOUD_PRINT_BITMAP_IMAGE_H_ |
+#include <stdint.h> |
+ |
+#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "ui/gfx/geometry/point.h" |
#include "ui/gfx/geometry/size.h" |
@@ -22,19 +25,19 @@ class BitmapImage { |
BitmapImage(const gfx::Size& size, Colorspace colorspace); |
~BitmapImage(); |
- uint8 channels() const; |
+ uint8_t channels() const; |
const gfx::Size& size() const { return size_; } |
Colorspace colorspace() const { return colorspace_; } |
- const uint8* pixel_data() const { return data_.get(); } |
- uint8* pixel_data() { return data_.get(); } |
+ const uint8_t* pixel_data() const { return data_.get(); } |
+ uint8_t* pixel_data() { return data_.get(); } |
- const uint8* GetPixel(const gfx::Point& point) const; |
+ const uint8_t* GetPixel(const gfx::Point& point) const; |
private: |
gfx::Size size_; |
Colorspace colorspace_; |
- scoped_ptr<uint8[]> data_; |
+ scoped_ptr<uint8_t[]> data_; |
DISALLOW_COPY_AND_ASSIGN(BitmapImage); |
}; |