| Index: chrome/utility/cloud_print/bitmap_image.cc
|
| diff --git a/chrome/utility/cloud_print/bitmap_image.cc b/chrome/utility/cloud_print/bitmap_image.cc
|
| index 5d43ee79bfe77345a9c528ecbaa066ea4125dde4..79f52ea2219387db1312e7297004c9bc5cc19b62 100644
|
| --- a/chrome/utility/cloud_print/bitmap_image.cc
|
| +++ b/chrome/utility/cloud_print/bitmap_image.cc
|
| @@ -8,24 +8,22 @@
|
| namespace cloud_print {
|
|
|
| namespace {
|
| -const uint8 kCurrentlySupportedNumberOfChannels = 4;
|
| +const uint8_t kCurrentlySupportedNumberOfChannels = 4;
|
| }
|
|
|
| -BitmapImage::BitmapImage(const gfx::Size& size,
|
| - Colorspace colorspace)
|
| +BitmapImage::BitmapImage(const gfx::Size& size, Colorspace colorspace)
|
| : size_(size),
|
| colorspace_(colorspace),
|
| - data_(new uint8[size.GetArea() * channels()]) {
|
| -}
|
| + data_(new uint8_t[size.GetArea() * channels()]) {}
|
|
|
| BitmapImage::~BitmapImage() {
|
| }
|
|
|
| -uint8 BitmapImage::channels() const {
|
| +uint8_t BitmapImage::channels() const {
|
| return kCurrentlySupportedNumberOfChannels;
|
| }
|
|
|
| -const uint8* BitmapImage::GetPixel(const gfx::Point& point) const {
|
| +const uint8_t* BitmapImage::GetPixel(const gfx::Point& point) const {
|
| DCHECK_LT(point.x(), size_.width());
|
| DCHECK_LT(point.y(), size_.height());
|
| return data_.get() + (point.y() * size_.width() + point.x()) * channels();
|
|
|