diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 01:29:01 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 01:29:01 +0000 |
| commit | 446c4e19c86538d5c45dbfeea01d523f0f4ce76b (patch) | |
| tree | 6fc9dcecb434b70eb3e0292d661b2d6510fcebb0 /printing/backend | |
| parent | dd507f56a61ec1479d5351708a6a1d00ce565f45 (diff) | |
| download | chromium_src-446c4e19c86538d5c45dbfeea01d523f0f4ce76b.zip chromium_src-446c4e19c86538d5c45dbfeea01d523f0f4ce76b.tar.gz chromium_src-446c4e19c86538d5c45dbfeea01d523f0f4ce76b.tar.bz2 | |
Fixed C++ type conversion.
BUG=239879
TBR=noamsml
Review URL: https://codereview.chromium.org/345453005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/backend')
| -rw-r--r-- | printing/backend/cups_helper.cc | 2 | ||||
| -rw-r--r-- | printing/backend/cups_helper_unittest.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc index b36722d..959e937 100644 --- a/printing/backend/cups_helper.cc +++ b/printing/backend/cups_helper.cc @@ -36,7 +36,7 @@ const char kDuplex[] = "Duplex"; const char kDuplexNone[] = "None"; const char kPageSize[] = "PageSize"; -const double kMicronsPerPoint = kHundrethsMMPerInch / kPointsPerInch * 10; +const double kMicronsPerPoint = 10.0f * kHundrethsMMPerInch / kPointsPerInch; #if !defined(OS_MACOSX) void ParseLpOptions(const base::FilePath& filepath, diff --git a/printing/backend/cups_helper_unittest.cc b/printing/backend/cups_helper_unittest.cc index 2a0e72b..01c5c65 100644 --- a/printing/backend/cups_helper_unittest.cc +++ b/printing/backend/cups_helper_unittest.cc @@ -198,10 +198,10 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingPageSize) { ASSERT_EQ(2UL, caps.papers.size()); EXPECT_EQ("Letter", caps.papers[0].vendor_id); EXPECT_EQ("US Letter", caps.papers[0].display_name); - EXPECT_EQ(214200, caps.papers[0].size_um.width()); - EXPECT_EQ(277200, caps.papers[0].size_um.height()); + EXPECT_EQ(215900, caps.papers[0].size_um.width()); + EXPECT_EQ(279400, caps.papers[0].size_um.height()); EXPECT_EQ("Legal", caps.papers[1].vendor_id); EXPECT_EQ("US Legal", caps.papers[1].display_name); - EXPECT_EQ(214200, caps.papers[1].size_um.width()); - EXPECT_EQ(352800, caps.papers[1].size_um.height()); + EXPECT_EQ(215900, caps.papers[1].size_um.width()); + EXPECT_EQ(355600, caps.papers[1].size_um.height()); } |