| Index: webkit/support/webkit_support_gfx.h
|
| ===================================================================
|
| --- webkit/support/webkit_support_gfx.h (revision 92815)
|
| +++ webkit/support/webkit_support_gfx.h (working copy)
|
| @@ -8,55 +8,39 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "ui/gfx/codec/png_codec.h"
|
| -#include "ui/gfx/size.h"
|
| +// TODO(darin): Remove once this #include has been upstreamed to ImageDiff.cpp.
|
| +// ImageDiff.cpp expects that PATH_MAX has already been defined :-/
|
| +#include <limits.h>
|
|
|
| namespace webkit_support {
|
|
|
| // Decode a PNG into an RGBA pixel array.
|
| -inline bool DecodePNG(const unsigned char* input, size_t input_size,
|
| - std::vector<unsigned char>* output,
|
| - int* width, int* height) {
|
| - return gfx::PNGCodec::Decode(input, input_size, gfx::PNGCodec::FORMAT_RGBA,
|
| - output, width, height);
|
| -}
|
| +bool DecodePNG(const unsigned char* input, size_t input_size,
|
| + std::vector<unsigned char>* output,
|
| + int* width, int* height);
|
|
|
| // Encode an RGBA pixel array into a PNG.
|
| -inline bool EncodeRGBAPNG(const unsigned char* input,
|
| - int width,
|
| - int height,
|
| - int row_byte_width,
|
| - std::vector<unsigned char>* output) {
|
| - return gfx::PNGCodec::Encode(input, gfx::PNGCodec::FORMAT_RGBA,
|
| - gfx::Size(width, height), row_byte_width, false,
|
| - std::vector<gfx::PNGCodec::Comment>(), output);
|
| -}
|
| +bool EncodeRGBAPNG(const unsigned char* input,
|
| + int width,
|
| + int height,
|
| + int row_byte_width,
|
| + std::vector<unsigned char>* output);
|
|
|
| // Encode an BGRA pixel array into a PNG.
|
| -inline bool EncodeBGRAPNG(const unsigned char* input,
|
| - int width,
|
| - int height,
|
| - int row_byte_width,
|
| - bool discard_transparency,
|
| - std::vector<unsigned char>* output) {
|
| - return gfx::PNGCodec::Encode(input, gfx::PNGCodec::FORMAT_BGRA,
|
| - gfx::Size(width, height), row_byte_width, discard_transparency,
|
| - std::vector<gfx::PNGCodec::Comment>(), output);
|
| -}
|
| +bool EncodeBGRAPNG(const unsigned char* input,
|
| + int width,
|
| + int height,
|
| + int row_byte_width,
|
| + bool discard_transparency,
|
| + std::vector<unsigned char>* output);
|
|
|
| -inline bool EncodeBGRAPNGWithChecksum(const unsigned char* input,
|
| - int width,
|
| - int height,
|
| - int row_byte_width,
|
| - bool discard_transparency,
|
| - const std::string& checksum,
|
| - std::vector<unsigned char>* output) {
|
| - std::vector<gfx::PNGCodec::Comment> comments;
|
| - comments.push_back(gfx::PNGCodec::Comment("checksum", checksum));
|
| - return gfx::PNGCodec::Encode(input, gfx::PNGCodec::FORMAT_BGRA,
|
| - gfx::Size(width, height), row_byte_width, discard_transparency,
|
| - comments, output);
|
| -}
|
| +bool EncodeBGRAPNGWithChecksum(const unsigned char* input,
|
| + int width,
|
| + int height,
|
| + int row_byte_width,
|
| + bool discard_transparency,
|
| + const std::string& checksum,
|
| + std::vector<unsigned char>* output);
|
|
|
| } // namespace webkit_support
|
|
|
|
|