[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 18:48:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f86a1bbd4e1b7d7f12ca8b1efc40696a538e7f97
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Dec 19 02:55:34 2010 +0000
2010-12-18 Noel Gordon <noel.gordon at gmail.com>
Reviewed by David Levin.
[chromium] Simplify the PNG encoder.
https://bugs.webkit.org/show_bug.cgi?id=50905
Remove PNGEncoderState class - it was a proxy for the encoder output, and
that is a Vector<>, so just write into it directly using append() to make
use of Vector<>'s resize() smarts. Simplify the preMultipliedBGRAtoRGBA()
and encode() routines, replace the OwnArrayPtr<> with a Vector<>.
canvas.toDataURL("image/png") is covered by existing tests.
* platform/image-encoders/skia/PNGImageEncoder.cpp:
(WebCore::writeOutput): Use a Vector<>, append() the encoded data to it.
(WebCore::preMultipliedBGRAtoRGBA): simplified.
(WebCore::PNGImageEncoder::encode): ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74320 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cd296f6..3b48311 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-18 Noel Gordon <noel.gordon at gmail.com>
+
+ Reviewed by David Levin.
+
+ [chromium] Simplify the PNG encoder.
+ https://bugs.webkit.org/show_bug.cgi?id=50905
+
+ Remove PNGEncoderState class - it was a proxy for the encoder output, and
+ that is a Vector<>, so just write into it directly using append() to make
+ use of Vector<>'s resize() smarts. Simplify the preMultipliedBGRAtoRGBA()
+ and encode() routines, replace the OwnArrayPtr<> with a Vector<>.
+
+ canvas.toDataURL("image/png") is covered by existing tests.
+
+ * platform/image-encoders/skia/PNGImageEncoder.cpp:
+ (WebCore::writeOutput): Use a Vector<>, append() the encoded data to it.
+ (WebCore::preMultipliedBGRAtoRGBA): simplified.
+ (WebCore::PNGImageEncoder::encode): ditto.
+
2010-12-18 Dan Bernstein <mitz at apple.com>
Reviewed by Cameron Zwarich.
diff --git a/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp b/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp
index 695c1e9..9fc82c4 100644
--- a/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp
+++ b/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, Google Inc. All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
@@ -32,8 +32,6 @@
#include "PNGImageEncoder.h"
#include "IntSize.h"
-#include "OwnArrayPtr.h"
-#include "Vector.h"
#include "SkBitmap.h"
#include "SkUnPreMultiply.h"
extern "C" {
@@ -42,108 +40,55 @@ extern "C" {
namespace WebCore {
-// Converts BGRA->RGBA and RGBA->BGRA and undoes alpha premultiplication.
-static void preMultipliedBGRAtoRGBA(const unsigned char* input, int numberOfPixels,
- unsigned char* output)
+static void writeOutput(png_structp png, png_bytep data, png_size_t size)
{
- SkBitmap inputBitmap;
- inputBitmap.setConfig(SkBitmap::kARGB_8888_Config, numberOfPixels, 1);
- inputBitmap.setPixels(const_cast<unsigned char*>(input));
- for (int x = 0; x < numberOfPixels; x++) {
- uint32_t srcPixel = *inputBitmap.getAddr32(x, 0);
- SkColor unmultiplied = SkUnPreMultiply::PMColorToColor(srcPixel);
- unsigned char* pixelOut = &output[x * 4];
- pixelOut[0] = SkColorGetR(unmultiplied);
- pixelOut[1] = SkColorGetG(unmultiplied);
- pixelOut[2] = SkColorGetB(unmultiplied);
- pixelOut[3] = SkColorGetA(unmultiplied);
- }
+ static_cast<Vector<unsigned char>*>(png->io_ptr)->append(data, size);
}
-// Encoder --------------------------------------------------------------------
-//
-// This section of the code is based on nsPNGEncoder.cpp in Mozilla
-// (Copyright 2005 Google Inc.)
-
-// Passed around as the io_ptr in the png structs so our callbacks know where
-// to write data.
-struct PNGEncoderState {
- PNGEncoderState(Vector<unsigned char>* o) : m_out(o) {}
- Vector<unsigned char>* m_out;
-};
-
-// Called by libpng to flush its internal buffer to ours.
-void encoderWriteCallback(png_structp png, png_bytep data, png_size_t size)
+static void preMultipliedBGRAtoRGBA(const SkPMColor* input, int pixels, unsigned char* output)
{
- PNGEncoderState* state = static_cast<PNGEncoderState*>(png_get_io_ptr(png));
- ASSERT(state->m_out);
-
- size_t oldSize = state->m_out->size();
- state->m_out->resize(oldSize + size);
- memcpy(&(*state->m_out)[oldSize], data, size);
+ while (pixels-- > 0) {
+ SkColor unmultiplied = SkUnPreMultiply::PMColorToColor(*input++);
+ *output++ = SkColorGetR(unmultiplied);
+ *output++ = SkColorGetG(unmultiplied);
+ *output++ = SkColorGetB(unmultiplied);
+ *output++ = SkColorGetA(unmultiplied);
+ }
}
-static bool encodeImpl(const unsigned char* input,
- const IntSize& size,
- int bytesPerRow,
- Vector<unsigned char>* output)
+bool PNGImageEncoder::encode(const SkBitmap& bitmap, Vector<unsigned char>* output)
{
- int inputColorComponents = 4;
- int outputColorComponents = 4;
- int pngOutputColorType = PNG_COLOR_TYPE_RGB_ALPHA;
- IntSize imageSize(size);
- imageSize.clampNegativeToZero();
-
- // Row stride should be at least as long as the length of the data.
- if (inputColorComponents * imageSize.width() > bytesPerRow) {
- ASSERT(false);
- return false;
- }
-
- png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
- if (!pngPtr)
- return false;
-
- png_info* infoPtr = png_create_info_struct(pngPtr);
- if (!infoPtr) {
- png_destroy_write_struct(&pngPtr, NULL);
- return false;
- }
+ if (bitmap.config() != SkBitmap::kARGB_8888_Config)
+ return false; // Only support ARGB 32 bpp skia bitmaps.
- OwnArrayPtr<unsigned char> rowPixels(new unsigned char[imageSize.width() * outputColorComponents]);
- PNGEncoderState state(output);
+ SkAutoLockPixels bitmapLock(bitmap);
+ IntSize imageSize(bitmap.width(), bitmap.height());
+ imageSize.clampNegativeToZero();
+ Vector<unsigned char> row;
- if (setjmp(png_jmpbuf(pngPtr))) {
- png_destroy_write_struct(&pngPtr, &infoPtr);
+ png_struct* png = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
+ png_info* info = png_create_info_struct(png);
+ if (!png || !info || setjmp(png_jmpbuf(png))) {
+ png_destroy_write_struct(png ? &png : 0, info ? &info : 0);
return false;
}
- // Set our callback for libpng to give us the data.
- png_set_write_fn(pngPtr, &state, encoderWriteCallback, NULL);
-
- png_set_IHDR(pngPtr, infoPtr, imageSize.width(), imageSize.height(), 8, pngOutputColorType,
- PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
- PNG_FILTER_TYPE_DEFAULT);
- png_write_info(pngPtr, infoPtr);
+ png_set_write_fn(png, output, writeOutput, 0);
+ png_set_IHDR(png, info, imageSize.width(), imageSize.height(),
+ 8, PNG_COLOR_TYPE_RGB_ALPHA, 0, 0, 0);
+ png_write_info(png, info);
+ const SkPMColor* pixels = static_cast<SkPMColor*>(bitmap.getPixels());
+ row.resize(imageSize.width() * bitmap.bytesPerPixel());
for (int y = 0; y < imageSize.height(); ++y) {
- preMultipliedBGRAtoRGBA(&input[y * bytesPerRow], imageSize.width(), rowPixels.get());
- png_write_row(pngPtr, rowPixels.get());
+ preMultipliedBGRAtoRGBA(pixels, imageSize.width(), row.data());
+ png_write_row(png, row.data());
+ pixels += imageSize.width();
}
- png_write_end(pngPtr, infoPtr);
- png_destroy_write_struct(&pngPtr, &infoPtr);
+ png_write_end(png, info);
+ png_destroy_write_struct(&png, &info);
return true;
}
-// static
-bool PNGImageEncoder::encode(const SkBitmap& image, Vector<unsigned char>* output)
-{
- if (image.config() != SkBitmap::kARGB_8888_Config)
- return false; // Only support ARGB 32 bpp skia bitmaps.
-
- SkAutoLockPixels bitmapLock(image);
- return encodeImpl(static_cast<unsigned char*>(image.getPixels()), IntSize(image.width(), image.height()), image.rowBytes(), output);
-}
-
} // namespace WebCore
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list