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

Side by Side Diff: third_party/WebKit/Source/platform/image-encoders/PNGImageEncoder.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010, Google Inc. All rights reserved. 2 * Copyright (c) 2010, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "platform/image-encoders/PNGImageEncoder.h" 31 #include "platform/image-encoders/PNGImageEncoder.h"
32 32
33 #include "platform/graphics/ImageBuffer.h" 33 #include "platform/graphics/ImageBuffer.h"
34 #include "wtf/OwnPtr.h" 34 #include "wtf/PtrUtil.h"
35 #include <memory>
35 36
36 namespace blink { 37 namespace blink {
37 38
38 PNGImageEncoderState::~PNGImageEncoderState() 39 PNGImageEncoderState::~PNGImageEncoderState()
39 { 40 {
40 png_destroy_write_struct(&m_png, &m_info); 41 png_destroy_write_struct(&m_png, &m_info);
41 } 42 }
42 43
43 static void writeOutput(png_structp png, png_bytep data, png_size_t size) 44 static void writeOutput(png_structp png, png_bytep data, png_size_t size)
44 { 45 {
45 static_cast<Vector<unsigned char>*>(png_get_io_ptr(png))->append(data, size) ; 46 static_cast<Vector<unsigned char>*>(png_get_io_ptr(png))->append(data, size) ;
46 } 47 }
47 48
48 PassOwnPtr<PNGImageEncoderState> PNGImageEncoderState::create(const IntSize& ima geSize, Vector<unsigned char>* output) 49 std::unique_ptr<PNGImageEncoderState> PNGImageEncoderState::create(const IntSize & imageSize, Vector<unsigned char>* output)
49 { 50 {
50 if (imageSize.width() <= 0 || imageSize.height() <= 0) 51 if (imageSize.width() <= 0 || imageSize.height() <= 0)
51 return nullptr; 52 return nullptr;
52 53
53 png_struct* png = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); 54 png_struct* png = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
54 png_info* info = png_create_info_struct(png); 55 png_info* info = png_create_info_struct(png);
55 if (!png || !info || setjmp(png_jmpbuf(png))) { 56 if (!png || !info || setjmp(png_jmpbuf(png))) {
56 png_destroy_write_struct(png ? &png : 0, info ? &info : 0); 57 png_destroy_write_struct(png ? &png : 0, info ? &info : 0);
57 return nullptr; 58 return nullptr;
58 } 59 }
59 60
60 // Optimize compression for speed. 61 // Optimize compression for speed.
61 // The parameters are the same as what libpng uses by default for RGB and RG BA images, except: 62 // The parameters are the same as what libpng uses by default for RGB and RG BA images, except:
62 // - the zlib compression level is 3 instead of 6, to avoid the lazy Ziv-Lem pel match searching; 63 // - the zlib compression level is 3 instead of 6, to avoid the lazy Ziv-Lem pel match searching;
63 // - the delta filter is 1 ("sub") instead of 5 ("all"), to reduce the filte r computations. 64 // - the delta filter is 1 ("sub") instead of 5 ("all"), to reduce the filte r computations.
64 // The zlib memory level (8) and strategy (Z_FILTERED) will be set inside li bpng. 65 // The zlib memory level (8) and strategy (Z_FILTERED) will be set inside li bpng.
65 // 66 //
66 // Avoid the zlib strategies Z_HUFFMAN_ONLY or Z_RLE. 67 // Avoid the zlib strategies Z_HUFFMAN_ONLY or Z_RLE.
67 // Although they are the fastest for poorly-compressible images (e.g. photog raphs), 68 // Although they are the fastest for poorly-compressible images (e.g. photog raphs),
68 // they are very slow for highly-compressible images (e.g. text, drawings or business graphics) 69 // they are very slow for highly-compressible images (e.g. text, drawings or business graphics)
69 png_set_compression_level(png, 3); 70 png_set_compression_level(png, 3);
70 png_set_filter(png, PNG_FILTER_TYPE_BASE, PNG_FILTER_SUB); 71 png_set_filter(png, PNG_FILTER_TYPE_BASE, PNG_FILTER_SUB);
71 72
72 png_set_write_fn(png, output, writeOutput, 0); 73 png_set_write_fn(png, output, writeOutput, 0);
73 png_set_IHDR(png, info, imageSize.width(), imageSize.height(), 8, PNG_COLOR_ TYPE_RGB_ALPHA, 0, 0, 0); 74 png_set_IHDR(png, info, imageSize.width(), imageSize.height(), 8, PNG_COLOR_ TYPE_RGB_ALPHA, 0, 0, 0);
74 png_write_info(png, info); 75 png_write_info(png, info);
75 76
76 return adoptPtr(new PNGImageEncoderState(png, info)); 77 return wrapUnique(new PNGImageEncoderState(png, info));
77 } 78 }
78 79
79 void PNGImageEncoder::writeOneRowToPng(unsigned char* pixels, PNGImageEncoderSta te* encoderState) 80 void PNGImageEncoder::writeOneRowToPng(unsigned char* pixels, PNGImageEncoderSta te* encoderState)
80 { 81 {
81 png_write_row(encoderState->png(), pixels); 82 png_write_row(encoderState->png(), pixels);
82 } 83 }
83 84
84 void PNGImageEncoder::finalizePng(PNGImageEncoderState* encoderState) 85 void PNGImageEncoder::finalizePng(PNGImageEncoderState* encoderState)
85 { 86 {
86 png_write_end(encoderState->png(), encoderState->info()); 87 png_write_end(encoderState->png(), encoderState->info());
87 } 88 }
88 89
89 static bool encodePixels(const IntSize& imageSize, const unsigned char* inputPix els, Vector<unsigned char>* output) 90 static bool encodePixels(const IntSize& imageSize, const unsigned char* inputPix els, Vector<unsigned char>* output)
90 { 91 {
91 OwnPtr<PNGImageEncoderState> encoderState = PNGImageEncoderState::create(ima geSize, output); 92 std::unique_ptr<PNGImageEncoderState> encoderState = PNGImageEncoderState::c reate(imageSize, output);
92 if (!encoderState.get()) 93 if (!encoderState.get())
93 return false; 94 return false;
94 95
95 unsigned char* pixels = const_cast<unsigned char*>(inputPixels); 96 unsigned char* pixels = const_cast<unsigned char*>(inputPixels);
96 const size_t pixelRowStride = imageSize.width() * 4; 97 const size_t pixelRowStride = imageSize.width() * 4;
97 for (int y = 0; y < imageSize.height(); ++y) { 98 for (int y = 0; y < imageSize.height(); ++y) {
98 PNGImageEncoder::writeOneRowToPng(pixels, encoderState.get()); 99 PNGImageEncoder::writeOneRowToPng(pixels, encoderState.get());
99 pixels += pixelRowStride; 100 pixels += pixelRowStride;
100 } 101 }
101 102
102 PNGImageEncoder::finalizePng(encoderState.get()); 103 PNGImageEncoder::finalizePng(encoderState.get());
103 return true; 104 return true;
104 } 105 }
105 106
106 bool PNGImageEncoder::encode(const ImageDataBuffer& imageData, Vector<unsigned c har>* output) 107 bool PNGImageEncoder::encode(const ImageDataBuffer& imageData, Vector<unsigned c har>* output)
107 { 108 {
108 if (!imageData.pixels()) 109 if (!imageData.pixels())
109 return false; 110 return false;
110 111
111 return encodePixels(imageData.size(), imageData.pixels(), output); 112 return encodePixels(imageData.size(), imageData.pixels(), output);
112 } 113 }
113 114
114 } // namespace blink 115 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698