Commit e9e4524b authored by levin@chromium.org's avatar levin@chromium.org

Attempted build fix for Chromium OSX release build following r81213.

* platform/image-encoders/skia/JPEGImageEncoder.cpp:
(WebCore::encodePixels): Change scoping of |pixels| to be after setjmp call.

git-svn-id: svn://svn.chromium.org/blink/trunk@81214 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent abc404a6
2011-03-15 David Levin <levin@chromium.org>
Attempted build fix for Chromium OSX release build following r81213.
* platform/image-encoders/skia/JPEGImageEncoder.cpp:
(WebCore::encodePixels): Change scoping of |pixels| to be after setjmp call.
2011-03-15 John Bauman <jbauman@chromium.org> 2011-03-15 John Bauman <jbauman@chromium.org>
Reviewed by Kenneth Russell. Reviewed by Kenneth Russell.
......
...@@ -99,7 +99,7 @@ static void RGBAtoRGB(const unsigned char* input, unsigned int pixels, unsigned ...@@ -99,7 +99,7 @@ static void RGBAtoRGB(const unsigned char* input, unsigned int pixels, unsigned
} }
} }
static bool encodePixels(const IntSize& inputSize, unsigned char* pixels, static bool encodePixels(const IntSize& inputSize, unsigned char* inputPixels,
bool premultiplied, int quality, Vector<unsigned char>* output) bool premultiplied, int quality, Vector<unsigned char>* output)
{ {
IntSize imageSize(inputSize); IntSize imageSize(inputSize);
...@@ -134,6 +134,7 @@ static bool encodePixels(const IntSize& inputSize, unsigned char* pixels, ...@@ -134,6 +134,7 @@ static bool encodePixels(const IntSize& inputSize, unsigned char* pixels,
jpeg_set_quality(&cinfo, quality, TRUE); jpeg_set_quality(&cinfo, quality, TRUE);
jpeg_start_compress(&cinfo, TRUE); jpeg_start_compress(&cinfo, TRUE);
unsigned char* pixels = inputPixels;
row.resize(cinfo.image_width * cinfo.input_components); row.resize(cinfo.image_width * cinfo.input_components);
while (cinfo.next_scanline < cinfo.image_height) { while (cinfo.next_scanline < cinfo.image_height) {
if (premultiplied) if (premultiplied)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment