OLD | NEW |
---|---|
1 // Copyright (c) 2010 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 "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/md5.h" | 8 #include "base/md5.h" |
9 #include "base/scoped_ptr.h" | |
9 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
11 #include "printing/native_metafile_factory.h" | |
10 #include "third_party/skia/include/core/SkColor.h" | 12 #include "third_party/skia/include/core/SkColor.h" |
11 #include "ui/gfx/codec/png_codec.h" | 13 #include "ui/gfx/codec/png_codec.h" |
12 | 14 |
13 namespace printing { | 15 namespace printing { |
14 | 16 |
15 Image::Image(const FilePath& path) | 17 Image::Image(const FilePath& path) |
16 : row_length_(0), | 18 : row_length_(0), |
17 ignore_alpha_(true) { | 19 ignore_alpha_(true) { |
18 std::string data; | 20 std::string data; |
19 file_util::ReadFileToString(path, &data); | 21 file_util::ReadFileToString(path, &data); |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
137 bool success = gfx::PNGCodec::Decode( | 139 bool success = gfx::PNGCodec::Decode( |
138 reinterpret_cast<const unsigned char*>(compressed.c_str()), | 140 reinterpret_cast<const unsigned char*>(compressed.c_str()), |
139 compressed.size(), gfx::PNGCodec::FORMAT_BGRA, &data_, &w, &h); | 141 compressed.size(), gfx::PNGCodec::FORMAT_BGRA, &data_, &w, &h); |
140 size_.SetSize(w, h); | 142 size_.SetSize(w, h); |
141 row_length_ = size_.width() * sizeof(uint32); | 143 row_length_ = size_.width() * sizeof(uint32); |
142 return success; | 144 return success; |
143 } | 145 } |
144 | 146 |
145 bool Image::LoadMetafile(const std::string& data) { | 147 bool Image::LoadMetafile(const std::string& data) { |
146 DCHECK(!data.empty()); | 148 DCHECK(!data.empty()); |
147 NativeMetafile metafile; | 149 scoped_ptr<NativeMetafile> metafile( |
148 metafile.Init(data.data(), data.size()); | 150 printing::NativeMetafileFactory::CreateMetafile()); |
149 return LoadMetafile(metafile); | 151 metafile->Init(data.data(), data.size()); |
152 return LoadMetafile(*metafile.get()); | |
vandebo (ex-Chrome)
2011/02/24 22:42:50
I think just *metafile will work.
dpapad
2011/02/26 01:42:29
Done.
| |
150 } | 153 } |
151 | 154 |
152 } // namespace printing | 155 } // namespace printing |
OLD | NEW |