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

Side by Side Diff: printing/image.cc

Issue 2835193007: Revert of clean up printing::Image and printing::Metafile (Closed)
Patch Set: Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « printing/image.h ('k') | printing/image_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "printing/image.h" 5 #include "printing/image.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/md5.h" 12 #include "base/md5.h"
13 #include "base/numerics/safe_conversions.h" 13 #include "base/numerics/safe_conversions.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "printing/metafile.h" 15 #include "printing/metafile.h"
16 #include "third_party/skia/include/core/SkColor.h" 16 #include "third_party/skia/include/core/SkColor.h"
17 #include "ui/gfx/codec/png_codec.h" 17 #include "ui/gfx/codec/png_codec.h"
18 18
19 namespace printing { 19 namespace printing {
20 20
21 Image::Image(const void* metafile_src_buffer, size_t metafile_src_buffer_size) 21 Image::Image(const Metafile& metafile)
22 : row_length_(0), ignore_alpha_(true) { 22 : row_length_(0),
23 LoadMetafile(metafile_src_buffer, metafile_src_buffer_size); 23 ignore_alpha_(true) {
24 LoadMetafile(metafile);
24 } 25 }
25 26
26 Image::Image(const Image&) = default; 27 Image::Image(const Image& image)
27 Image::Image(Image&&) = default; 28 : size_(image.size_),
29 row_length_(image.row_length_),
30 data_(image.data_),
31 ignore_alpha_(image.ignore_alpha_) {
32 }
28 33
29 Image::~Image() {} 34 Image::~Image() {}
30 35
31 std::string Image::checksum() const { 36 std::string Image::checksum() const {
32 base::MD5Digest digest; 37 base::MD5Digest digest;
33 base::MD5Sum(&data_[0], data_.size(), &digest); 38 base::MD5Sum(&data_[0], data_.size(), &digest);
34 return base::MD5DigestToBase16(digest); 39 return base::MD5DigestToBase16(digest);
35 } 40 }
36 41
37 bool Image::SaveToPng(const base::FilePath& filepath) const { 42 bool Image::SaveToPng(const base::FilePath& filepath) const {
(...skipping 10 matching lines...) Expand all
48 if (success) { 53 if (success) {
49 int write_bytes = base::WriteFile( 54 int write_bytes = base::WriteFile(
50 filepath, 55 filepath,
51 reinterpret_cast<char*>(&*compressed.begin()), 56 reinterpret_cast<char*>(&*compressed.begin()),
52 base::checked_cast<int>(compressed.size())); 57 base::checked_cast<int>(compressed.size()));
53 success = (write_bytes == static_cast<int>(compressed.size())); 58 success = (write_bytes == static_cast<int>(compressed.size()));
54 DCHECK(success); 59 DCHECK(success);
55 } 60 }
56 return success; 61 return success;
57 } 62 }
63
64 double Image::PercentageDifferent(const Image& rhs) const {
65 if (size_.width() == 0 || size_.height() == 0 ||
66 rhs.size_.width() == 0 || rhs.size_.height() == 0)
67 return 100.;
68
69 int width = std::min(size_.width(), rhs.size_.width());
70 int height = std::min(size_.height(), rhs.size_.height());
71 // Compute pixels different in the overlap
72 int pixels_different = 0;
73 for (int y = 0; y < height; ++y) {
74 for (int x = 0; x < width; ++x) {
75 uint32_t lhs_pixel = pixel_at(x, y);
76 uint32_t rhs_pixel = rhs.pixel_at(x, y);
77 if (lhs_pixel != rhs_pixel)
78 ++pixels_different;
79 }
80
81 // Look for extra right lhs pixels. They should be white.
82 for (int x = width; x < size_.width(); ++x) {
83 uint32_t lhs_pixel = pixel_at(x, y);
84 if (lhs_pixel != Color(SK_ColorWHITE))
85 ++pixels_different;
86 }
87
88 // Look for extra right rhs pixels. They should be white.
89 for (int x = width; x < rhs.size_.width(); ++x) {
90 uint32_t rhs_pixel = rhs.pixel_at(x, y);
91 if (rhs_pixel != Color(SK_ColorWHITE))
92 ++pixels_different;
93 }
94 }
95
96 // Look for extra bottom lhs pixels. They should be white.
97 for (int y = height; y < size_.height(); ++y) {
98 for (int x = 0; x < size_.width(); ++x) {
99 uint32_t lhs_pixel = pixel_at(x, y);
100 if (lhs_pixel != Color(SK_ColorWHITE))
101 ++pixels_different;
102 }
103 }
104
105 // Look for extra bottom rhs pixels. They should be white.
106 for (int y = height; y < rhs.size_.height(); ++y) {
107 for (int x = 0; x < rhs.size_.width(); ++x) {
108 uint32_t rhs_pixel = rhs.pixel_at(x, y);
109 if (rhs_pixel != Color(SK_ColorWHITE))
110 ++pixels_different;
111 }
112 }
113
114 // Like the WebKit ImageDiff tool, we define percentage different in terms
115 // of the size of the 'actual' bitmap.
116 double total_pixels = static_cast<double>(size_.width()) *
117 static_cast<double>(height);
118 return static_cast<double>(pixels_different) / total_pixels * 100.;
119 }
120
121 bool Image::LoadPng(const std::string& compressed) {
122 int w;
123 int h;
124 bool success = gfx::PNGCodec::Decode(
125 reinterpret_cast<const unsigned char*>(compressed.c_str()),
126 compressed.size(), gfx::PNGCodec::FORMAT_BGRA, &data_, &w, &h);
127 size_.SetSize(w, h);
128 row_length_ = size_.width() * sizeof(uint32_t);
129 return success;
130 }
131
58 } // namespace printing 132 } // namespace printing
OLDNEW
« no previous file with comments | « printing/image.h ('k') | printing/image_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698