Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(503)

Unified Diff: printing/image.h

Issue 1343593002: Cleanup code in printing/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « printing/emf_win_unittest.cc ('k') | printing/image.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/image.h
diff --git a/printing/image.h b/printing/image.h
index c5a609ea586e962c11e08b06d1c51b0639c2021c..1406a8554e40f1fd5f5006b68672ab4376dcfd71 100644
--- a/printing/image.h
+++ b/printing/image.h
@@ -53,18 +53,18 @@ class PRINTING_EXPORT Image {
double PercentageDifferent(const Image& rhs) const;
// Returns the 0x0RGB or 0xARGB value of the pixel at the given location.
- uint32 Color(uint32 color) const {
+ uint32_t Color(uint32_t color) const {
if (ignore_alpha_)
return color & 0xFFFFFF; // Strip out A.
else
return color;
}
- uint32 pixel_at(int x, int y) const {
+ uint32_t pixel_at(int x, int y) const {
DCHECK(x >= 0 && x < size_.width());
DCHECK(y >= 0 && y < size_.height());
- const uint32* data = reinterpret_cast<const uint32*>(&*data_.begin());
- const uint32* data_row = data + y * row_length_ / sizeof(uint32);
+ const uint32_t* data = reinterpret_cast<const uint32_t*>(&*data_.begin());
+ const uint32_t* data_row = data + y * row_length_ / sizeof(uint32_t);
return Color(data_row[x]);
}
@@ -85,7 +85,7 @@ class PRINTING_EXPORT Image {
// Length of a line in bytes.
int row_length_;
- // Actual bitmap data in arrays of RGBAs (so when loaded as uint32, it's
+ // Actual bitmap data in arrays of RGBAs (so when loaded as uint32_t, it's
// 0xABGR).
std::vector<unsigned char> data_;
« no previous file with comments | « printing/emf_win_unittest.cc ('k') | printing/image.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698