2001-01-22 22:01:03 +00:00
|
|
|
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
|
|
*
|
2012-05-21 11:12:37 +00:00
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2012-10-01 12:16:03 +00:00
|
|
|
#include "ImageLogging.h"
|
2012-04-03 21:57:22 +00:00
|
|
|
#include "nsPNGDecoder.h"
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2001-10-12 06:43:52 +00:00
|
|
|
#include "nsMemory.h"
|
2001-02-20 22:43:56 +00:00
|
|
|
#include "nsRect.h"
|
|
|
|
|
2001-10-12 06:43:52 +00:00
|
|
|
#include "nsIInputStream.h"
|
2001-02-20 22:43:56 +00:00
|
|
|
|
2010-08-14 04:09:49 +00:00
|
|
|
#include "RasterImage.h"
|
2001-01-26 12:05:55 +00:00
|
|
|
|
2007-01-31 21:09:20 +00:00
|
|
|
#include "gfxColor.h"
|
2002-04-13 10:03:59 +00:00
|
|
|
#include "nsColor.h"
|
|
|
|
|
2001-10-12 06:43:52 +00:00
|
|
|
#include "nspr.h"
|
|
|
|
#include "png.h"
|
|
|
|
|
2007-07-23 22:02:17 +00:00
|
|
|
#include "gfxPlatform.h"
|
|
|
|
|
2010-08-23 02:30:46 +00:00
|
|
|
namespace mozilla {
|
2012-01-06 16:02:27 +00:00
|
|
|
namespace image {
|
2010-08-14 04:09:49 +00:00
|
|
|
|
2002-09-23 17:34:21 +00:00
|
|
|
#ifdef PR_LOGGING
|
2012-10-29 23:32:10 +00:00
|
|
|
static PRLogModuleInfo *
|
|
|
|
GetPNGLog()
|
|
|
|
{
|
|
|
|
static PRLogModuleInfo *sPNGLog;
|
|
|
|
if (!sPNGLog)
|
|
|
|
sPNGLog = PR_NewLogModule("PNGDecoder");
|
|
|
|
return sPNGLog;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PRLogModuleInfo *
|
|
|
|
GetPNGDecoderAccountingLog()
|
|
|
|
{
|
|
|
|
static PRLogModuleInfo *sPNGDecoderAccountingLog;
|
|
|
|
if (!sPNGDecoderAccountingLog)
|
|
|
|
sPNGDecoderAccountingLog = PR_NewLogModule("PNGDecoderAccounting");
|
|
|
|
return sPNGDecoderAccountingLog;
|
|
|
|
}
|
2002-09-23 17:34:21 +00:00
|
|
|
#endif
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2009-09-12 22:44:18 +00:00
|
|
|
/* limit image dimensions (bug #251381) */
|
|
|
|
#define MOZ_PNG_MAX_DIMENSION 1000000L
|
|
|
|
|
2010-08-23 02:30:46 +00:00
|
|
|
// For size decodes
|
2009-09-12 22:44:18 +00:00
|
|
|
#define WIDTH_OFFSET 16
|
|
|
|
#define HEIGHT_OFFSET (WIDTH_OFFSET + 4)
|
|
|
|
#define BYTES_NEEDED_FOR_DIMENSIONS (HEIGHT_OFFSET + 4)
|
|
|
|
|
2011-08-25 20:09:01 +00:00
|
|
|
// First 8 bytes of a PNG file
|
2012-08-22 15:56:38 +00:00
|
|
|
const uint8_t
|
2011-08-25 20:09:01 +00:00
|
|
|
nsPNGDecoder::pngSignatureBytes[] = { 137, 80, 78, 71, 13, 10, 26, 10 };
|
2009-09-12 22:44:18 +00:00
|
|
|
|
2012-12-18 16:37:15 +00:00
|
|
|
nsPNGDecoder::nsPNGDecoder(RasterImage &aImage, imgDecoderObserver* aObserver)
|
2011-09-27 16:24:03 +00:00
|
|
|
: Decoder(aImage, aObserver),
|
2012-07-30 14:20:58 +00:00
|
|
|
mPNG(nullptr), mInfo(nullptr),
|
|
|
|
mCMSLine(nullptr), interlacebuf(nullptr),
|
|
|
|
mInProfile(nullptr), mTransform(nullptr),
|
|
|
|
mHeaderBuf(nullptr), mHeaderBytesRead(0),
|
2011-10-17 14:59:28 +00:00
|
|
|
mChannels(0), mFrameIsHidden(false),
|
|
|
|
mCMSMode(0), mDisablePremultipliedAlpha(false)
|
2001-01-22 22:01:03 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
nsPNGDecoder::~nsPNGDecoder()
|
|
|
|
{
|
2010-08-23 02:30:46 +00:00
|
|
|
if (mPNG)
|
|
|
|
png_destroy_read_struct(&mPNG, mInfo ? &mInfo : NULL, NULL);
|
2007-07-23 22:02:17 +00:00
|
|
|
if (mCMSLine)
|
|
|
|
nsMemory::Free(mCMSLine);
|
2001-02-20 22:43:56 +00:00
|
|
|
if (interlacebuf)
|
|
|
|
nsMemory::Free(interlacebuf);
|
2007-07-23 22:02:17 +00:00
|
|
|
if (mInProfile) {
|
2009-04-07 16:02:11 +00:00
|
|
|
qcms_profile_release(mInProfile);
|
2007-07-23 22:02:17 +00:00
|
|
|
|
|
|
|
/* mTransform belongs to us only if mInProfile is non-null */
|
|
|
|
if (mTransform)
|
2009-04-07 16:02:11 +00:00
|
|
|
qcms_transform_release(mTransform);
|
2007-07-23 22:02:17 +00:00
|
|
|
}
|
2009-09-12 22:44:18 +00:00
|
|
|
if (mHeaderBuf)
|
|
|
|
nsMemory::Free(mHeaderBuf);
|
2001-01-22 22:01:03 +00:00
|
|
|
}
|
|
|
|
|
2007-03-20 23:56:50 +00:00
|
|
|
// CreateFrame() is used for both simple and animated images
|
2009-12-04 02:41:00 +00:00
|
|
|
void nsPNGDecoder::CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset,
|
2012-08-22 15:56:38 +00:00
|
|
|
int32_t width, int32_t height,
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
gfxASurface::gfxImageFormat format)
|
2007-03-20 23:56:50 +00:00
|
|
|
{
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t imageDataLength;
|
2011-09-29 13:17:13 +00:00
|
|
|
nsresult rv = mImage.EnsureFrame(GetFrameCount(), x_offset, y_offset,
|
|
|
|
width, height, format,
|
|
|
|
&mImageData, &imageDataLength);
|
2007-03-20 23:56:50 +00:00
|
|
|
if (NS_FAILED(rv))
|
2010-01-05 21:46:26 +00:00
|
|
|
longjmp(png_jmpbuf(mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
|
2007-03-20 23:56:50 +00:00
|
|
|
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
mFrameRect.x = x_offset;
|
|
|
|
mFrameRect.y = y_offset;
|
|
|
|
mFrameRect.width = width;
|
|
|
|
mFrameRect.height = height;
|
|
|
|
|
2012-12-18 16:37:14 +00:00
|
|
|
// Tell the superclass we're starting a frame
|
|
|
|
PostFrameStart();
|
|
|
|
|
2010-01-05 21:46:26 +00:00
|
|
|
#ifdef PNG_APNG_SUPPORTED
|
2007-03-21 19:12:00 +00:00
|
|
|
if (png_get_valid(mPNG, mInfo, PNG_INFO_acTL))
|
2007-03-20 23:56:50 +00:00
|
|
|
SetAnimFrameInfo();
|
2010-01-05 21:46:26 +00:00
|
|
|
#endif
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
|
2012-10-29 23:32:10 +00:00
|
|
|
PR_LOG(GetPNGDecoderAccountingLog(), PR_LOG_DEBUG,
|
2010-01-05 21:46:26 +00:00
|
|
|
("PNGDecoderAccounting: nsPNGDecoder::CreateFrame -- created "
|
|
|
|
"image frame with %dx%d pixels in container %p",
|
2007-10-19 00:36:34 +00:00
|
|
|
width, height,
|
2011-09-29 13:17:13 +00:00
|
|
|
&mImage));
|
2007-10-19 00:36:34 +00:00
|
|
|
|
2011-10-17 14:59:28 +00:00
|
|
|
mFrameHasNoAlpha = true;
|
2007-03-20 23:56:50 +00:00
|
|
|
}
|
|
|
|
|
2010-01-05 21:46:26 +00:00
|
|
|
#ifdef PNG_APNG_SUPPORTED
|
2007-03-20 23:56:50 +00:00
|
|
|
// set timeout and frame disposal method for the current frame
|
|
|
|
void nsPNGDecoder::SetAnimFrameInfo()
|
|
|
|
{
|
2007-11-13 11:03:32 +00:00
|
|
|
png_uint_16 delay_num, delay_den;
|
|
|
|
/* delay, in seconds is delay_num/delay_den */
|
2007-03-22 23:35:51 +00:00
|
|
|
png_byte dispose_op;
|
2007-10-23 19:33:20 +00:00
|
|
|
png_byte blend_op;
|
2012-08-22 15:56:38 +00:00
|
|
|
int32_t timeout; /* in milliseconds */
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2007-03-20 23:56:50 +00:00
|
|
|
delay_num = png_get_next_frame_delay_num(mPNG, mInfo);
|
|
|
|
delay_den = png_get_next_frame_delay_den(mPNG, mInfo);
|
2007-03-22 23:35:51 +00:00
|
|
|
dispose_op = png_get_next_frame_dispose_op(mPNG, mInfo);
|
2007-10-23 19:33:20 +00:00
|
|
|
blend_op = png_get_next_frame_blend_op(mPNG, mInfo);
|
2007-03-22 23:35:51 +00:00
|
|
|
|
2007-03-20 23:56:50 +00:00
|
|
|
if (delay_num == 0) {
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
timeout = 0; // SetFrameTimeout() will set to a minimum
|
2007-03-20 23:56:50 +00:00
|
|
|
} else {
|
|
|
|
if (delay_den == 0)
|
2007-11-13 11:03:32 +00:00
|
|
|
delay_den = 100; // so says the APNG spec
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2007-03-20 23:56:50 +00:00
|
|
|
// Need to cast delay_num to float to have a proper division and
|
|
|
|
// the result to int to avoid compiler warning
|
2012-08-22 15:56:38 +00:00
|
|
|
timeout = static_cast<int32_t>
|
2012-08-09 07:09:42 +00:00
|
|
|
(static_cast<double>(delay_num) * 1000 / delay_den);
|
2007-03-20 23:56:50 +00:00
|
|
|
}
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
|
2012-12-18 16:37:14 +00:00
|
|
|
uint32_t numFrames = GetFrameCount();
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
|
2011-09-29 13:17:13 +00:00
|
|
|
mImage.SetFrameTimeout(numFrames - 1, timeout);
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2007-03-22 23:35:51 +00:00
|
|
|
if (dispose_op == PNG_DISPOSE_OP_PREVIOUS)
|
2011-09-29 13:17:13 +00:00
|
|
|
mImage.SetFrameDisposalMethod(numFrames - 1,
|
|
|
|
RasterImage::kDisposeRestorePrevious);
|
2007-03-22 23:35:51 +00:00
|
|
|
else if (dispose_op == PNG_DISPOSE_OP_BACKGROUND)
|
2011-09-29 13:17:13 +00:00
|
|
|
mImage.SetFrameDisposalMethod(numFrames - 1,
|
|
|
|
RasterImage::kDisposeClear);
|
2007-03-20 23:56:50 +00:00
|
|
|
else
|
2011-09-29 13:17:13 +00:00
|
|
|
mImage.SetFrameDisposalMethod(numFrames - 1,
|
|
|
|
RasterImage::kDisposeKeep);
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2007-10-23 19:33:20 +00:00
|
|
|
if (blend_op == PNG_BLEND_OP_SOURCE)
|
2011-09-29 13:17:13 +00:00
|
|
|
mImage.SetFrameBlendMethod(numFrames - 1, RasterImage::kBlendSource);
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
/*else // 'over' is the default
|
2011-09-29 13:17:13 +00:00
|
|
|
mImage.SetFrameBlendMethod(numFrames - 1, RasterImage::kBlendOver); */
|
2007-03-20 23:56:50 +00:00
|
|
|
}
|
2010-01-05 21:46:26 +00:00
|
|
|
#endif
|
2007-03-20 23:56:50 +00:00
|
|
|
|
2008-02-13 10:53:17 +00:00
|
|
|
// set timeout and frame disposal method for the current frame
|
|
|
|
void nsPNGDecoder::EndImageFrame()
|
|
|
|
{
|
2010-09-12 15:22:30 +00:00
|
|
|
if (mFrameIsHidden)
|
|
|
|
return;
|
|
|
|
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t numFrames = 1;
|
2010-01-05 21:46:26 +00:00
|
|
|
#ifdef PNG_APNG_SUPPORTED
|
2012-12-18 16:37:14 +00:00
|
|
|
numFrames = GetFrameCount();
|
2008-02-13 10:53:17 +00:00
|
|
|
|
|
|
|
// We can't use mPNG->num_frames_read as it may be one ahead.
|
|
|
|
if (numFrames > 1) {
|
|
|
|
// Tell the image renderer that the frame is complete
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
if (mFrameHasNoAlpha)
|
2011-09-29 13:17:13 +00:00
|
|
|
mImage.SetFrameHasNoAlpha(numFrames - 1);
|
2008-02-13 10:53:17 +00:00
|
|
|
|
2012-03-23 22:10:50 +00:00
|
|
|
// PNG is always non-premult
|
|
|
|
mImage.SetFrameAsNonPremult(numFrames - 1, true);
|
|
|
|
|
2010-08-24 21:12:04 +00:00
|
|
|
PostInvalidation(mFrameRect);
|
2008-02-13 10:53:17 +00:00
|
|
|
}
|
2010-01-05 21:46:26 +00:00
|
|
|
#endif
|
2008-02-13 10:53:17 +00:00
|
|
|
|
2010-08-23 02:30:46 +00:00
|
|
|
PostFrameStop();
|
2008-02-13 10:53:17 +00:00
|
|
|
}
|
|
|
|
|
2010-09-12 15:22:30 +00:00
|
|
|
void
|
2010-08-23 02:30:46 +00:00
|
|
|
nsPNGDecoder::InitInternal()
|
2010-08-22 14:13:09 +00:00
|
|
|
{
|
2011-01-13 01:45:13 +00:00
|
|
|
mCMSMode = gfxPlatform::GetCMSMode();
|
|
|
|
if ((mDecodeFlags & DECODER_NO_COLORSPACE_CONVERSION) != 0)
|
|
|
|
mCMSMode = eCMSMode_Off;
|
|
|
|
mDisablePremultipliedAlpha = (mDecodeFlags & DECODER_NO_PREMULTIPLY_ALPHA) != 0;
|
2010-08-23 02:30:46 +00:00
|
|
|
|
2010-03-09 18:22:44 +00:00
|
|
|
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
|
2007-11-07 04:29:37 +00:00
|
|
|
static png_byte color_chunks[]=
|
|
|
|
{ 99, 72, 82, 77, '\0', /* cHRM */
|
|
|
|
105, 67, 67, 80, '\0'}; /* iCCP */
|
2004-08-04 14:02:34 +00:00
|
|
|
static png_byte unused_chunks[]=
|
|
|
|
{ 98, 75, 71, 68, '\0', /* bKGD */
|
|
|
|
104, 73, 83, 84, '\0', /* hIST */
|
|
|
|
105, 84, 88, 116, '\0', /* iTXt */
|
|
|
|
111, 70, 70, 115, '\0', /* oFFs */
|
|
|
|
112, 67, 65, 76, '\0', /* pCAL */
|
|
|
|
115, 67, 65, 76, '\0', /* sCAL */
|
|
|
|
112, 72, 89, 115, '\0', /* pHYs */
|
|
|
|
115, 66, 73, 84, '\0', /* sBIT */
|
|
|
|
115, 80, 76, 84, '\0', /* sPLT */
|
|
|
|
116, 69, 88, 116, '\0', /* tEXt */
|
|
|
|
116, 73, 77, 69, '\0', /* tIME */
|
|
|
|
122, 84, 88, 116, '\0'}; /* zTXt */
|
|
|
|
#endif
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2010-08-23 02:30:46 +00:00
|
|
|
// For size decodes, we only need a small buffer
|
|
|
|
if (IsSizeDecode()) {
|
2012-08-22 15:56:38 +00:00
|
|
|
mHeaderBuf = (uint8_t *)moz_xmalloc(BYTES_NEEDED_FOR_DIMENSIONS);
|
2010-09-12 15:22:30 +00:00
|
|
|
return;
|
2009-09-12 22:44:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* For full decodes, do png init stuff */
|
2001-01-22 22:01:03 +00:00
|
|
|
|
|
|
|
/* Initialize the container's source image header. */
|
|
|
|
/* Always decode to 24 bit pixdepth */
|
|
|
|
|
2010-03-12 14:15:00 +00:00
|
|
|
mPNG = png_create_read_struct(PNG_LIBPNG_VER_STRING,
|
2010-08-23 02:30:46 +00:00
|
|
|
NULL, nsPNGDecoder::error_callback,
|
|
|
|
nsPNGDecoder::warning_callback);
|
2010-09-12 15:22:27 +00:00
|
|
|
if (!mPNG) {
|
|
|
|
PostDecoderError(NS_ERROR_OUT_OF_MEMORY);
|
2010-09-12 15:22:30 +00:00
|
|
|
return;
|
2010-09-12 15:22:27 +00:00
|
|
|
}
|
2001-01-22 22:01:03 +00:00
|
|
|
|
|
|
|
mInfo = png_create_info_struct(mPNG);
|
|
|
|
if (!mInfo) {
|
2010-09-12 15:22:27 +00:00
|
|
|
PostDecoderError(NS_ERROR_OUT_OF_MEMORY);
|
2001-01-22 22:01:03 +00:00
|
|
|
png_destroy_read_struct(&mPNG, NULL, NULL);
|
2010-09-12 15:22:30 +00:00
|
|
|
return;
|
2001-01-22 22:01:03 +00:00
|
|
|
}
|
|
|
|
|
2010-03-09 18:22:44 +00:00
|
|
|
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
|
2004-08-04 14:02:34 +00:00
|
|
|
/* Ignore unused chunks */
|
2011-01-13 01:45:13 +00:00
|
|
|
if (mCMSMode == eCMSMode_Off)
|
2007-11-07 04:29:37 +00:00
|
|
|
png_set_keep_unknown_chunks(mPNG, 1, color_chunks, 2);
|
2010-01-05 21:46:26 +00:00
|
|
|
|
2006-09-26 21:15:04 +00:00
|
|
|
png_set_keep_unknown_chunks(mPNG, 1, unused_chunks,
|
2010-03-12 14:15:00 +00:00
|
|
|
(int)sizeof(unused_chunks)/5);
|
2010-03-09 18:22:44 +00:00
|
|
|
#endif
|
|
|
|
|
2010-03-12 14:15:00 +00:00
|
|
|
#ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
|
2011-01-13 01:45:13 +00:00
|
|
|
if (mCMSMode != eCMSMode_Off)
|
2010-03-12 14:15:00 +00:00
|
|
|
png_set_chunk_malloc_max(mPNG, 4000000L);
|
2004-08-04 14:02:34 +00:00
|
|
|
#endif
|
|
|
|
|
2012-07-24 00:02:20 +00:00
|
|
|
#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
|
|
|
|
#ifndef PR_LOGGING
|
|
|
|
/* Disallow palette-index checking, for speed; we would ignore the warning
|
|
|
|
* anyhow unless we have defined PR_LOGGING. This feature was added at
|
|
|
|
* libpng version 1.5.10 and is disabled in the embedded libpng but enabled
|
|
|
|
* by default in the system libpng. This call also disables it in the
|
|
|
|
* system libpng, for decoding speed. Bug #745202.
|
|
|
|
*/
|
|
|
|
png_set_check_for_invalid_index(mPNG, 0);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2001-04-16 09:17:59 +00:00
|
|
|
/* use this as libpng "progressive pointer" (retrieve in callbacks) */
|
2007-07-08 07:08:04 +00:00
|
|
|
png_set_progressive_read_fn(mPNG, static_cast<png_voidp>(this),
|
2010-08-23 02:30:46 +00:00
|
|
|
nsPNGDecoder::info_callback,
|
|
|
|
nsPNGDecoder::row_callback,
|
|
|
|
nsPNGDecoder::end_callback);
|
2001-01-22 22:01:03 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2010-09-12 15:22:30 +00:00
|
|
|
void
|
2012-08-22 15:56:38 +00:00
|
|
|
nsPNGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount)
|
2001-01-22 22:01:03 +00:00
|
|
|
{
|
2009-09-12 22:44:18 +00:00
|
|
|
// We use gotos, so we need to declare variables here
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t width = 0;
|
|
|
|
uint32_t height = 0;
|
2009-09-12 22:44:18 +00:00
|
|
|
|
2010-09-12 15:22:31 +00:00
|
|
|
NS_ABORT_IF_FALSE(!HasError(), "Shouldn't call WriteInternal after error!");
|
2009-09-12 22:44:18 +00:00
|
|
|
|
|
|
|
// If we only want width/height, we don't need to go through libpng
|
2010-08-23 02:30:46 +00:00
|
|
|
if (IsSizeDecode()) {
|
2009-09-12 22:44:18 +00:00
|
|
|
|
|
|
|
// Are we done?
|
|
|
|
if (mHeaderBytesRead == BYTES_NEEDED_FOR_DIMENSIONS)
|
2010-09-12 15:22:30 +00:00
|
|
|
return;
|
2009-09-12 22:44:18 +00:00
|
|
|
|
|
|
|
// Read data into our header buffer
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t bytesToRead = NS_MIN(aCount, BYTES_NEEDED_FOR_DIMENSIONS -
|
2009-12-04 02:41:00 +00:00
|
|
|
mHeaderBytesRead);
|
2009-09-12 22:44:18 +00:00
|
|
|
memcpy(mHeaderBuf + mHeaderBytesRead, aBuffer, bytesToRead);
|
|
|
|
mHeaderBytesRead += bytesToRead;
|
|
|
|
|
|
|
|
// If we're done now, verify the data and set up the container
|
|
|
|
if (mHeaderBytesRead == BYTES_NEEDED_FOR_DIMENSIONS) {
|
|
|
|
|
|
|
|
// Check that the signature bytes are right
|
2011-08-25 20:09:01 +00:00
|
|
|
if (memcmp(mHeaderBuf, nsPNGDecoder::pngSignatureBytes,
|
|
|
|
sizeof(pngSignatureBytes))) {
|
2010-09-12 15:22:27 +00:00
|
|
|
PostDataError();
|
2010-09-12 15:22:30 +00:00
|
|
|
return;
|
2010-09-12 15:22:27 +00:00
|
|
|
}
|
2009-09-12 22:44:18 +00:00
|
|
|
|
|
|
|
// Grab the width and height, accounting for endianness (thanks libpng!)
|
|
|
|
width = png_get_uint_32(mHeaderBuf + WIDTH_OFFSET);
|
|
|
|
height = png_get_uint_32(mHeaderBuf + HEIGHT_OFFSET);
|
2001-02-20 22:43:56 +00:00
|
|
|
|
2009-09-12 22:44:18 +00:00
|
|
|
// Too big?
|
2010-09-12 15:22:27 +00:00
|
|
|
if ((width > MOZ_PNG_MAX_DIMENSION) || (height > MOZ_PNG_MAX_DIMENSION)) {
|
|
|
|
PostDataError();
|
2010-09-12 15:22:30 +00:00
|
|
|
return;
|
2010-09-12 15:22:27 +00:00
|
|
|
}
|
2009-09-12 22:44:18 +00:00
|
|
|
|
2010-08-23 02:30:46 +00:00
|
|
|
// Post our size to the superclass
|
|
|
|
PostSize(width, height);
|
2009-09-12 22:44:18 +00:00
|
|
|
}
|
2002-03-12 07:15:21 +00:00
|
|
|
}
|
|
|
|
|
2009-09-12 22:44:18 +00:00
|
|
|
// Otherwise, we're doing a standard decode
|
|
|
|
else {
|
|
|
|
|
|
|
|
// libpng uses setjmp/longjmp for error handling - set the buffer
|
2010-01-05 21:46:26 +00:00
|
|
|
if (setjmp(png_jmpbuf(mPNG))) {
|
2010-09-12 15:22:27 +00:00
|
|
|
|
|
|
|
// We might not really know what caused the error, but it makes more
|
|
|
|
// sense to blame the data.
|
2010-09-12 15:22:31 +00:00
|
|
|
if (!HasError())
|
2010-09-12 15:22:27 +00:00
|
|
|
PostDataError();
|
|
|
|
|
2009-09-12 22:44:18 +00:00
|
|
|
png_destroy_read_struct(&mPNG, &mInfo, NULL);
|
2010-09-12 15:22:30 +00:00
|
|
|
return;
|
2009-09-12 22:44:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Pass the data off to libpng
|
2009-10-16 02:54:44 +00:00
|
|
|
png_process_data(mPNG, mInfo, (unsigned char *)aBuffer, aCount);
|
2009-09-12 22:44:18 +00:00
|
|
|
|
2008-11-06 21:31:20 +00:00
|
|
|
}
|
2009-09-12 22:44:18 +00:00
|
|
|
}
|
2002-03-12 07:15:21 +00:00
|
|
|
|
2009-12-04 02:41:00 +00:00
|
|
|
// Sets up gamma pre-correction in libpng before our callback gets called.
|
2008-08-30 22:54:58 +00:00
|
|
|
// We need to do this if we don't end up with a CMS profile.
|
|
|
|
static void
|
|
|
|
PNGDoGammaCorrection(png_structp png_ptr, png_infop info_ptr)
|
|
|
|
{
|
|
|
|
double aGamma;
|
|
|
|
|
|
|
|
if (png_get_gAMA(png_ptr, info_ptr, &aGamma)) {
|
|
|
|
if ((aGamma <= 0.0) || (aGamma > 21474.83)) {
|
|
|
|
aGamma = 0.45455;
|
|
|
|
png_set_gAMA(png_ptr, info_ptr, aGamma);
|
|
|
|
}
|
|
|
|
png_set_gamma(png_ptr, 2.2, aGamma);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
png_set_gamma(png_ptr, 2.2, 0.45455);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2007-07-23 22:02:17 +00:00
|
|
|
// Adapted from http://www.littlecms.com/pngchrm.c example code
|
2009-04-07 16:02:11 +00:00
|
|
|
static qcms_profile *
|
2007-07-23 22:02:17 +00:00
|
|
|
PNGGetColorProfile(png_structp png_ptr, png_infop info_ptr,
|
2012-08-22 15:56:38 +00:00
|
|
|
int color_type, qcms_data_type *inType, uint32_t *intent)
|
2007-07-23 22:02:17 +00:00
|
|
|
{
|
2012-07-30 14:20:58 +00:00
|
|
|
qcms_profile *profile = nullptr;
|
2009-04-07 16:02:11 +00:00
|
|
|
*intent = QCMS_INTENT_PERCEPTUAL; // Our default
|
2007-07-23 22:02:17 +00:00
|
|
|
|
|
|
|
// First try to see if iCCP chunk is present
|
|
|
|
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
|
|
|
|
png_uint_32 profileLen;
|
2011-03-29 00:14:00 +00:00
|
|
|
#if (PNG_LIBPNG_VER < 10500)
|
2007-07-23 22:02:17 +00:00
|
|
|
char *profileData, *profileName;
|
2011-03-29 00:14:00 +00:00
|
|
|
#else
|
|
|
|
png_bytep profileData;
|
|
|
|
png_charp profileName;
|
|
|
|
#endif
|
2007-07-23 22:02:17 +00:00
|
|
|
int compression;
|
|
|
|
|
|
|
|
png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
|
|
|
|
&profileData, &profileLen);
|
|
|
|
|
2011-03-29 00:14:00 +00:00
|
|
|
profile = qcms_profile_from_memory(
|
|
|
|
#if (PNG_LIBPNG_VER < 10500)
|
|
|
|
profileData,
|
|
|
|
#else
|
|
|
|
(char *)profileData,
|
|
|
|
#endif
|
|
|
|
profileLen);
|
2009-04-07 16:02:11 +00:00
|
|
|
if (profile) {
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t profileSpace = qcms_profile_get_color_space(profile);
|
2007-07-23 22:02:17 +00:00
|
|
|
|
2011-09-29 06:19:26 +00:00
|
|
|
bool mismatch = false;
|
2009-04-07 16:02:11 +00:00
|
|
|
if (color_type & PNG_COLOR_MASK_COLOR) {
|
|
|
|
if (profileSpace != icSigRgbData)
|
2011-10-17 14:59:28 +00:00
|
|
|
mismatch = true;
|
2009-04-07 16:02:11 +00:00
|
|
|
} else {
|
|
|
|
if (profileSpace == icSigRgbData)
|
|
|
|
png_set_gray_to_rgb(png_ptr);
|
|
|
|
else if (profileSpace != icSigGrayData)
|
2011-10-17 14:59:28 +00:00
|
|
|
mismatch = true;
|
2009-04-07 16:02:11 +00:00
|
|
|
}
|
2007-07-23 22:02:17 +00:00
|
|
|
|
2009-04-07 16:02:11 +00:00
|
|
|
if (mismatch) {
|
|
|
|
qcms_profile_release(profile);
|
2012-07-30 14:20:58 +00:00
|
|
|
profile = nullptr;
|
2009-04-07 16:02:11 +00:00
|
|
|
} else {
|
|
|
|
*intent = qcms_profile_get_rendering_intent(profile);
|
|
|
|
}
|
2007-07-23 22:02:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check sRGB chunk
|
|
|
|
if (!profile && png_get_valid(png_ptr, info_ptr, PNG_INFO_sRGB)) {
|
2009-04-07 16:02:11 +00:00
|
|
|
profile = qcms_profile_sRGB();
|
2007-07-23 22:02:17 +00:00
|
|
|
|
|
|
|
if (profile) {
|
|
|
|
int fileIntent;
|
2009-12-04 02:41:00 +00:00
|
|
|
png_set_gray_to_rgb(png_ptr);
|
2007-07-23 22:02:17 +00:00
|
|
|
png_get_sRGB(png_ptr, info_ptr, &fileIntent);
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t map[] = { QCMS_INTENT_PERCEPTUAL,
|
2009-12-04 02:41:00 +00:00
|
|
|
QCMS_INTENT_RELATIVE_COLORIMETRIC,
|
|
|
|
QCMS_INTENT_SATURATION,
|
|
|
|
QCMS_INTENT_ABSOLUTE_COLORIMETRIC };
|
2007-07-23 22:02:17 +00:00
|
|
|
*intent = map[fileIntent];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check gAMA/cHRM chunks
|
2009-12-04 02:41:00 +00:00
|
|
|
if (!profile &&
|
2008-08-30 22:54:58 +00:00
|
|
|
png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA) &&
|
|
|
|
png_get_valid(png_ptr, info_ptr, PNG_INFO_cHRM)) {
|
2009-04-07 16:02:11 +00:00
|
|
|
qcms_CIE_xyYTRIPLE primaries;
|
|
|
|
qcms_CIE_xyY whitePoint;
|
2008-08-30 22:54:58 +00:00
|
|
|
|
|
|
|
png_get_cHRM(png_ptr, info_ptr,
|
|
|
|
&whitePoint.x, &whitePoint.y,
|
2009-04-07 16:02:11 +00:00
|
|
|
&primaries.red.x, &primaries.red.y,
|
|
|
|
&primaries.green.x, &primaries.green.y,
|
|
|
|
&primaries.blue.x, &primaries.blue.y);
|
2008-08-30 22:54:58 +00:00
|
|
|
whitePoint.Y =
|
2009-04-07 16:02:11 +00:00
|
|
|
primaries.red.Y = primaries.green.Y = primaries.blue.Y = 1.0;
|
2007-07-23 22:02:17 +00:00
|
|
|
|
|
|
|
double gammaOfFile;
|
|
|
|
|
|
|
|
png_get_gAMA(png_ptr, info_ptr, &gammaOfFile);
|
|
|
|
|
2009-12-04 02:41:00 +00:00
|
|
|
profile = qcms_profile_create_rgb_with_gamma(whitePoint, primaries,
|
|
|
|
1.0/gammaOfFile);
|
2007-07-23 22:02:17 +00:00
|
|
|
|
2007-12-04 04:43:09 +00:00
|
|
|
if (profile)
|
2007-07-23 22:02:17 +00:00
|
|
|
png_set_gray_to_rgb(png_ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (profile) {
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t profileSpace = qcms_profile_get_color_space(profile);
|
2007-07-23 22:02:17 +00:00
|
|
|
if (profileSpace == icSigGrayData) {
|
|
|
|
if (color_type & PNG_COLOR_MASK_ALPHA)
|
2009-04-07 16:02:11 +00:00
|
|
|
*inType = QCMS_DATA_GRAYA_8;
|
2007-07-23 22:02:17 +00:00
|
|
|
else
|
2009-04-07 16:02:11 +00:00
|
|
|
*inType = QCMS_DATA_GRAY_8;
|
2007-07-23 22:02:17 +00:00
|
|
|
} else {
|
|
|
|
if (color_type & PNG_COLOR_MASK_ALPHA ||
|
|
|
|
png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
|
2009-04-07 16:02:11 +00:00
|
|
|
*inType = QCMS_DATA_RGBA_8;
|
2007-07-23 22:02:17 +00:00
|
|
|
else
|
2009-04-07 16:02:11 +00:00
|
|
|
*inType = QCMS_DATA_RGB_8;
|
2007-07-23 22:02:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return profile;
|
|
|
|
}
|
2001-01-22 22:01:03 +00:00
|
|
|
|
|
|
|
void
|
2010-08-23 02:30:46 +00:00
|
|
|
nsPNGDecoder::info_callback(png_structp png_ptr, png_infop info_ptr)
|
2001-01-22 22:01:03 +00:00
|
|
|
{
|
|
|
|
/* int number_passes; NOT USED */
|
2001-01-26 12:05:55 +00:00
|
|
|
png_uint_32 width, height;
|
|
|
|
int bit_depth, color_type, interlace_type, compression_type, filter_type;
|
2008-07-11 20:52:30 +00:00
|
|
|
unsigned int channels;
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2007-03-20 23:56:50 +00:00
|
|
|
png_bytep trans = NULL;
|
|
|
|
int num_trans = 0;
|
|
|
|
|
2009-12-04 02:41:00 +00:00
|
|
|
nsPNGDecoder *decoder =
|
|
|
|
static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2001-01-26 12:05:55 +00:00
|
|
|
/* always decode to 24-bit RGB or 32-bit RGBA */
|
|
|
|
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
|
|
|
|
&interlace_type, &compression_type, &filter_type);
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2009-09-12 22:44:18 +00:00
|
|
|
/* Are we too big? */
|
2007-03-20 23:56:50 +00:00
|
|
|
if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION)
|
2010-01-05 21:46:26 +00:00
|
|
|
longjmp(png_jmpbuf(decoder->mPNG), 1);
|
2009-09-12 22:44:18 +00:00
|
|
|
|
2010-08-23 02:30:46 +00:00
|
|
|
// Post our size to the superclass
|
|
|
|
decoder->PostSize(width, height);
|
2011-05-11 09:46:59 +00:00
|
|
|
if (decoder->HasError()) {
|
2012-05-19 19:32:37 +00:00
|
|
|
// Setting the size led to an error.
|
2011-05-11 09:46:59 +00:00
|
|
|
longjmp(png_jmpbuf(decoder->mPNG), 1);
|
|
|
|
}
|
2004-08-04 14:02:34 +00:00
|
|
|
|
2001-01-26 12:05:55 +00:00
|
|
|
if (color_type == PNG_COLOR_TYPE_PALETTE)
|
|
|
|
png_set_expand(png_ptr);
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2001-01-26 12:05:55 +00:00
|
|
|
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
|
|
|
|
png_set_expand(png_ptr);
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2001-01-26 12:05:55 +00:00
|
|
|
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
|
2008-08-19 08:12:31 +00:00
|
|
|
int sample_max = (1 << bit_depth);
|
|
|
|
png_color_16p trans_values;
|
|
|
|
png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values);
|
|
|
|
/* libpng doesn't reject a tRNS chunk with out-of-range samples
|
|
|
|
so we check it here to avoid setting up a useless opacity
|
|
|
|
channel or producing unexpected transparent pixels when using
|
|
|
|
libpng-1.2.19 through 1.2.26 (bug #428045) */
|
|
|
|
if ((color_type == PNG_COLOR_TYPE_GRAY &&
|
|
|
|
(int)trans_values->gray > sample_max) ||
|
|
|
|
(color_type == PNG_COLOR_TYPE_RGB &&
|
|
|
|
((int)trans_values->red > sample_max ||
|
|
|
|
(int)trans_values->green > sample_max ||
|
|
|
|
(int)trans_values->blue > sample_max)))
|
2010-01-05 21:46:26 +00:00
|
|
|
{
|
|
|
|
/* clear the tRNS valid flag and release tRNS memory */
|
|
|
|
png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
|
|
|
|
}
|
2008-08-19 08:12:31 +00:00
|
|
|
else
|
2010-01-05 21:46:26 +00:00
|
|
|
png_set_expand(png_ptr);
|
2001-01-26 12:05:55 +00:00
|
|
|
}
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2001-01-26 12:05:55 +00:00
|
|
|
if (bit_depth == 16)
|
2012-03-04 03:18:31 +00:00
|
|
|
png_set_scale_16(png_ptr);
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2009-04-07 16:02:11 +00:00
|
|
|
qcms_data_type inType;
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t intent = -1;
|
|
|
|
uint32_t pIntent;
|
2011-01-13 01:45:13 +00:00
|
|
|
if (decoder->mCMSMode != eCMSMode_Off) {
|
2008-07-23 17:33:12 +00:00
|
|
|
intent = gfxPlatform::GetRenderingIntent();
|
2007-07-23 22:02:17 +00:00
|
|
|
decoder->mInProfile = PNGGetColorProfile(png_ptr, info_ptr,
|
2008-07-23 17:33:12 +00:00
|
|
|
color_type, &inType, &pIntent);
|
|
|
|
/* If we're not mandating an intent, use the one from the image. */
|
2012-08-22 15:56:38 +00:00
|
|
|
if (intent == uint32_t(-1))
|
2008-07-23 17:33:12 +00:00
|
|
|
intent = pIntent;
|
2007-07-23 22:02:17 +00:00
|
|
|
}
|
|
|
|
if (decoder->mInProfile && gfxPlatform::GetCMSOutputProfile()) {
|
2009-04-07 16:02:11 +00:00
|
|
|
qcms_data_type outType;
|
2007-07-23 22:02:17 +00:00
|
|
|
|
2007-09-10 20:01:18 +00:00
|
|
|
if (color_type & PNG_COLOR_MASK_ALPHA || num_trans)
|
2009-04-07 16:02:11 +00:00
|
|
|
outType = QCMS_DATA_RGBA_8;
|
2007-07-23 22:02:17 +00:00
|
|
|
else
|
2009-04-07 16:02:11 +00:00
|
|
|
outType = QCMS_DATA_RGB_8;
|
2008-08-18 05:08:53 +00:00
|
|
|
|
2009-04-07 16:02:11 +00:00
|
|
|
decoder->mTransform = qcms_transform_create(decoder->mInProfile,
|
2009-12-04 02:41:00 +00:00
|
|
|
inType,
|
|
|
|
gfxPlatform::GetCMSOutputProfile(),
|
|
|
|
outType,
|
|
|
|
(qcms_intent)intent);
|
2007-07-23 22:02:17 +00:00
|
|
|
} else {
|
2007-12-04 04:43:09 +00:00
|
|
|
png_set_gray_to_rgb(png_ptr);
|
2008-08-30 22:54:58 +00:00
|
|
|
|
2011-01-13 01:45:13 +00:00
|
|
|
// only do gamma correction if CMS isn't entirely disabled
|
|
|
|
if (decoder->mCMSMode != eCMSMode_Off)
|
|
|
|
PNGDoGammaCorrection(png_ptr, info_ptr);
|
|
|
|
|
|
|
|
if (decoder->mCMSMode == eCMSMode_All) {
|
2007-09-10 20:01:18 +00:00
|
|
|
if (color_type & PNG_COLOR_MASK_ALPHA || num_trans)
|
2007-07-23 22:02:17 +00:00
|
|
|
decoder->mTransform = gfxPlatform::GetCMSRGBATransform();
|
|
|
|
else
|
|
|
|
decoder->mTransform = gfxPlatform::GetCMSRGBTransform();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-26 12:05:55 +00:00
|
|
|
/* let libpng expand interlaced images */
|
|
|
|
if (interlace_type == PNG_INTERLACE_ADAM7) {
|
2001-04-16 09:41:01 +00:00
|
|
|
/* number_passes = */
|
|
|
|
png_set_interlace_handling(png_ptr);
|
2001-01-26 12:05:55 +00:00
|
|
|
}
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2001-01-26 12:05:55 +00:00
|
|
|
/* now all of those things we set above are used to update various struct
|
|
|
|
* members and whatnot, after which we can get channels, rowbytes, etc. */
|
|
|
|
png_read_update_info(png_ptr, info_ptr);
|
2007-07-23 22:02:17 +00:00
|
|
|
decoder->mChannels = channels = png_get_channels(png_ptr, info_ptr);
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2001-01-26 12:05:55 +00:00
|
|
|
/*---------------------------------------------------------------*/
|
|
|
|
/* copy PNG info into imagelib structs (formerly png_set_dims()) */
|
|
|
|
/*---------------------------------------------------------------*/
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2012-10-17 22:54:25 +00:00
|
|
|
// This code is currently unused, but it will be needed for bug 517713.
|
|
|
|
#if 0
|
2012-08-22 15:56:38 +00:00
|
|
|
int32_t alpha_bits = 1;
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2007-07-23 22:02:17 +00:00
|
|
|
if (channels == 2 || channels == 4) {
|
2001-03-23 07:12:52 +00:00
|
|
|
/* check if alpha is coming from a tRNS chunk and is binary */
|
|
|
|
if (num_trans) {
|
2008-08-19 08:12:31 +00:00
|
|
|
/* if it's not an indexed color image, tRNS means binary */
|
2001-03-23 07:12:52 +00:00
|
|
|
if (color_type == PNG_COLOR_TYPE_PALETTE) {
|
|
|
|
for (int i=0; i<num_trans; i++) {
|
|
|
|
if ((trans[i] != 0) && (trans[i] != 255)) {
|
|
|
|
alpha_bits = 8;
|
|
|
|
break;
|
2001-01-22 22:01:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2001-01-26 12:05:55 +00:00
|
|
|
} else {
|
2001-03-23 07:12:52 +00:00
|
|
|
alpha_bits = 8;
|
2001-01-22 22:01:03 +00:00
|
|
|
}
|
2001-01-26 12:05:55 +00:00
|
|
|
}
|
2012-10-17 22:54:25 +00:00
|
|
|
#endif
|
2001-01-26 12:05:55 +00:00
|
|
|
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
if (channels == 1 || channels == 3)
|
|
|
|
decoder->format = gfxASurface::ImageFormatRGB24;
|
|
|
|
else if (channels == 2 || channels == 4)
|
|
|
|
decoder->format = gfxASurface::ImageFormatARGB32;
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2010-01-05 21:46:26 +00:00
|
|
|
#ifdef PNG_APNG_SUPPORTED
|
2007-03-21 19:12:00 +00:00
|
|
|
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_acTL))
|
2010-08-23 02:30:46 +00:00
|
|
|
png_set_progressive_frame_fn(png_ptr, nsPNGDecoder::frame_info_callback, NULL);
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2007-04-19 20:40:53 +00:00
|
|
|
if (png_get_first_frame_is_hidden(png_ptr, info_ptr)) {
|
2011-10-17 14:59:28 +00:00
|
|
|
decoder->mFrameIsHidden = true;
|
2007-03-20 23:56:50 +00:00
|
|
|
} else {
|
2010-01-05 21:46:26 +00:00
|
|
|
#endif
|
2007-03-20 23:56:50 +00:00
|
|
|
decoder->CreateFrame(0, 0, width, height, decoder->format);
|
2010-01-05 21:46:26 +00:00
|
|
|
#ifdef PNG_APNG_SUPPORTED
|
2007-03-20 23:56:50 +00:00
|
|
|
}
|
2010-01-05 21:46:26 +00:00
|
|
|
#endif
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2007-07-23 22:02:17 +00:00
|
|
|
if (decoder->mTransform &&
|
|
|
|
(channels <= 2 || interlace_type == PNG_INTERLACE_ADAM7)) {
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t bpp[] = { 0, 3, 4, 3, 4 };
|
2007-07-23 22:02:17 +00:00
|
|
|
decoder->mCMSLine =
|
2012-08-22 15:56:38 +00:00
|
|
|
(uint8_t *)moz_malloc(bpp[channels] * width);
|
2009-09-12 22:44:18 +00:00
|
|
|
if (!decoder->mCMSLine) {
|
2010-01-05 21:46:26 +00:00
|
|
|
longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
|
2009-09-12 22:44:18 +00:00
|
|
|
}
|
2007-07-23 22:02:17 +00:00
|
|
|
}
|
|
|
|
|
2001-02-20 22:43:56 +00:00
|
|
|
if (interlace_type == PNG_INTERLACE_ADAM7) {
|
2012-09-28 06:57:33 +00:00
|
|
|
if (height < INT32_MAX / (width * channels))
|
2012-08-22 15:56:38 +00:00
|
|
|
decoder->interlacebuf = (uint8_t *)moz_malloc(channels * width * height);
|
2001-02-20 22:43:56 +00:00
|
|
|
if (!decoder->interlacebuf) {
|
2010-01-05 21:46:26 +00:00
|
|
|
longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
|
2007-03-20 23:56:50 +00:00
|
|
|
}
|
2001-02-20 22:43:56 +00:00
|
|
|
}
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2009-06-28 23:08:40 +00:00
|
|
|
/* Reject any ancillary chunk after IDAT with a bad CRC (bug #397593).
|
|
|
|
* It would be better to show the default frame (if one has already been
|
|
|
|
* successfully decoded) before bailing, but it's simpler to just bail
|
|
|
|
* out with an error message.
|
|
|
|
*/
|
2011-02-01 03:45:10 +00:00
|
|
|
png_set_crc_action(png_ptr, PNG_CRC_NO_CHANGE, PNG_CRC_ERROR_QUIT);
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2001-01-26 12:05:55 +00:00
|
|
|
return;
|
2001-01-22 22:01:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2010-08-23 02:30:46 +00:00
|
|
|
nsPNGDecoder::row_callback(png_structp png_ptr, png_bytep new_row,
|
|
|
|
png_uint_32 row_num, int pass)
|
2001-01-22 22:01:03 +00:00
|
|
|
{
|
|
|
|
/* libpng comments:
|
|
|
|
*
|
|
|
|
* this function is called for every row in the image. If the
|
|
|
|
* image is interlacing, and you turned on the interlace handler,
|
|
|
|
* this function will be called for every row in every pass.
|
|
|
|
* Some of these rows will not be changed from the previous pass.
|
|
|
|
* When the row is not changed, the new_row variable will be NULL.
|
|
|
|
* The rows and passes are called in order, so you don't really
|
|
|
|
* need the row_num and pass, but I'm supplying them because it
|
|
|
|
* may make your life easier.
|
|
|
|
*
|
|
|
|
* For the non-NULL rows of interlaced images, you must call
|
|
|
|
* png_progressive_combine_row() passing in the row and the
|
|
|
|
* old row. You can call this function for NULL rows (it will
|
|
|
|
* just return) and for non-interlaced images (it just does the
|
|
|
|
* memcpy for you) if it will make the code easier. Thus, you
|
|
|
|
* can just do this for all cases:
|
|
|
|
*
|
|
|
|
* png_progressive_combine_row(png_ptr, old_row, new_row);
|
|
|
|
*
|
|
|
|
* where old_row is what was displayed for previous rows. Note
|
|
|
|
* that the first pass (pass == 0 really) will completely cover
|
|
|
|
* the old row, so the rows do not have to be initialized. After
|
|
|
|
* the first pass (and only for interlaced images), you will have
|
|
|
|
* to pass the current row, and the function will combine the
|
|
|
|
* old row and the new row.
|
|
|
|
*/
|
2009-12-04 02:41:00 +00:00
|
|
|
nsPNGDecoder *decoder =
|
|
|
|
static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
|
|
|
|
|
2008-02-13 10:53:17 +00:00
|
|
|
// skip this frame
|
|
|
|
if (decoder->mFrameIsHidden)
|
2007-03-20 23:56:50 +00:00
|
|
|
return;
|
2001-01-22 22:01:03 +00:00
|
|
|
|
2010-08-23 02:30:44 +00:00
|
|
|
if (row_num >= (png_uint_32) decoder->mFrameRect.height)
|
2010-06-25 19:20:18 +00:00
|
|
|
return;
|
|
|
|
|
2001-01-22 22:01:03 +00:00
|
|
|
if (new_row) {
|
2012-08-22 15:56:38 +00:00
|
|
|
int32_t width = decoder->mFrameRect.width;
|
|
|
|
uint32_t iwidth = decoder->mFrameRect.width;
|
2001-02-20 22:43:56 +00:00
|
|
|
|
2008-02-13 10:53:17 +00:00
|
|
|
png_bytep line = new_row;
|
|
|
|
if (decoder->interlacebuf) {
|
|
|
|
line = decoder->interlacebuf + (row_num * decoder->mChannels * width);
|
|
|
|
png_progressive_combine_row(png_ptr, line, new_row);
|
|
|
|
}
|
2007-02-27 21:13:25 +00:00
|
|
|
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t bpr = width * sizeof(uint32_t);
|
|
|
|
uint32_t *cptr32 = (uint32_t*)(decoder->mImageData + (row_num*bpr));
|
2011-09-29 06:19:26 +00:00
|
|
|
bool rowHasNoAlpha = true;
|
2007-01-31 21:09:20 +00:00
|
|
|
|
2007-07-23 22:02:17 +00:00
|
|
|
if (decoder->mTransform) {
|
|
|
|
if (decoder->mCMSLine) {
|
2009-12-04 02:41:00 +00:00
|
|
|
qcms_transform_data(decoder->mTransform, line, decoder->mCMSLine,
|
|
|
|
iwidth);
|
2007-07-23 22:02:17 +00:00
|
|
|
/* copy alpha over */
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t channels = decoder->mChannels;
|
2007-07-23 22:02:17 +00:00
|
|
|
if (channels == 2 || channels == 4) {
|
2012-08-22 15:56:38 +00:00
|
|
|
for (uint32_t i = 0; i < iwidth; i++)
|
2007-07-23 22:02:17 +00:00
|
|
|
decoder->mCMSLine[4 * i + 3] = line[channels * i + channels - 1];
|
|
|
|
}
|
|
|
|
line = decoder->mCMSLine;
|
|
|
|
} else {
|
2009-04-07 16:02:11 +00:00
|
|
|
qcms_transform_data(decoder->mTransform, line, line, iwidth);
|
2007-07-23 22:02:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-13 10:53:17 +00:00
|
|
|
switch (decoder->format) {
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
case gfxASurface::ImageFormatRGB24:
|
2006-03-25 00:34:48 +00:00
|
|
|
{
|
2007-12-21 10:26:31 +00:00
|
|
|
// counter for while() loops below
|
2012-08-22 15:56:38 +00:00
|
|
|
uint32_t idx = iwidth;
|
2007-12-21 10:26:31 +00:00
|
|
|
|
2008-01-30 06:22:23 +00:00
|
|
|
// copy as bytes until source pointer is 32-bit-aligned
|
2008-01-31 01:04:36 +00:00
|
|
|
for (; (NS_PTR_TO_UINT32(line) & 0x3) && idx; --idx) {
|
2012-09-06 05:31:29 +00:00
|
|
|
*cptr32++ = gfxPackedPixel(0xFF, line[0], line[1], line[2]);
|
2009-12-04 02:41:00 +00:00
|
|
|
line += 3;
|
2008-01-30 06:22:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// copy pixels in blocks of 4
|
|
|
|
while (idx >= 4) {
|
|
|
|
GFX_BLOCK_RGB_TO_FRGB(line, cptr32);
|
2007-12-21 10:26:31 +00:00
|
|
|
idx -= 4;
|
|
|
|
line += 12;
|
|
|
|
cptr32 += 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
// copy remaining pixel(s)
|
|
|
|
while (idx--) {
|
|
|
|
// 32-bit read of final pixel will exceed buffer, so read bytes
|
2012-09-06 05:31:29 +00:00
|
|
|
*cptr32++ = gfxPackedPixel(0xFF, line[0], line[1], line[2]);
|
2007-01-31 21:09:20 +00:00
|
|
|
line += 3;
|
2006-03-25 00:34:48 +00:00
|
|
|
}
|
|
|
|
}
|
2001-02-20 22:43:56 +00:00
|
|
|
break;
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
case gfxASurface::ImageFormatARGB32:
|
2001-02-20 22:43:56 +00:00
|
|
|
{
|
2011-01-13 01:45:13 +00:00
|
|
|
if (!decoder->mDisablePremultipliedAlpha) {
|
2012-08-22 15:56:38 +00:00
|
|
|
for (uint32_t x=width; x>0; --x) {
|
2012-09-06 05:31:29 +00:00
|
|
|
*cptr32++ = gfxPackedPixel(line[3], line[0], line[1], line[2]);
|
2011-01-13 01:45:13 +00:00
|
|
|
if (line[3] != 0xff)
|
2011-10-17 14:59:28 +00:00
|
|
|
rowHasNoAlpha = false;
|
2011-01-13 01:45:13 +00:00
|
|
|
line += 4;
|
|
|
|
}
|
|
|
|
} else {
|
2012-08-22 15:56:38 +00:00
|
|
|
for (uint32_t x=width; x>0; --x) {
|
2012-09-06 05:31:29 +00:00
|
|
|
*cptr32++ = gfxPackedPixelNoPreMultiply(line[3], line[0], line[1], line[2]);
|
2011-01-13 01:45:13 +00:00
|
|
|
if (line[3] != 0xff)
|
2011-10-17 14:59:28 +00:00
|
|
|
rowHasNoAlpha = false;
|
2011-01-13 01:45:13 +00:00
|
|
|
line += 4;
|
|
|
|
}
|
2001-02-20 22:43:56 +00:00
|
|
|
}
|
2006-03-25 00:34:48 +00:00
|
|
|
}
|
2003-04-18 14:30:10 +00:00
|
|
|
break;
|
Bug 753 - Remove nsIImage, gfxIImageFrame, and their implementations, and expose an equivalent api on imgIContainer. r=roc,josh,bz,longsonr,vlad,karlt,jimm,bsmedberg,mfinkle,peterw,peterv sr=vlad,roc
--HG--
rename : gfx/src/shared/gfxImageFrame.cpp => modules/libpr0n/src/imgFrame.cpp
rename : gfx/src/shared/gfxImageFrame.h => modules/libpr0n/src/imgFrame.h
2009-07-21 01:50:15 +00:00
|
|
|
default:
|
2010-09-12 15:22:27 +00:00
|
|
|
longjmp(png_jmpbuf(decoder->mPNG), 1);
|
2001-02-20 22:43:56 +00:00
|
|
|
}
|
|
|
|
|
2007-08-17 19:54:58 +00:00
|
|
|
if (!rowHasNoAlpha)
|
2011-10-17 14:59:28 +00:00
|
|
|
decoder->mFrameHasNoAlpha = false;
|
2007-08-17 19:54:58 +00:00
|
|
|
|
2012-12-18 16:37:14 +00:00
|
|
|
uint32_t numFrames = decoder->GetFrameCount();
|
2008-02-13 10:53:17 +00:00
|
|
|
if (numFrames <= 1) {
|
|
|
|
// Only do incremental image display for the first frame
|
2010-08-24 21:12:04 +00:00
|
|
|
// XXXbholley - this check should be handled in the superclass
|
2008-02-13 10:53:17 +00:00
|
|
|
nsIntRect r(0, row_num, width, 1);
|
2010-08-24 21:12:04 +00:00
|
|
|
decoder->PostInvalidation(r);
|
2008-02-13 10:53:17 +00:00
|
|
|
}
|
2001-01-22 22:01:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-03-20 23:56:50 +00:00
|
|
|
// got the header of a new frame that's coming
|
|
|
|
void
|
2010-08-23 02:30:46 +00:00
|
|
|
nsPNGDecoder::frame_info_callback(png_structp png_ptr, png_uint_32 frame_num)
|
2007-03-20 23:56:50 +00:00
|
|
|
{
|
2010-01-05 21:46:26 +00:00
|
|
|
#ifdef PNG_APNG_SUPPORTED
|
2007-03-20 23:56:50 +00:00
|
|
|
png_uint_32 x_offset, y_offset;
|
2012-08-22 15:56:38 +00:00
|
|
|
int32_t width, height;
|
2009-12-04 02:41:00 +00:00
|
|
|
|
|
|
|
nsPNGDecoder *decoder =
|
|
|
|
static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
|
|
|
|
|
2007-03-20 23:56:50 +00:00
|
|
|
// old frame is done
|
2010-09-12 15:22:30 +00:00
|
|
|
decoder->EndImageFrame();
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2010-09-12 15:22:30 +00:00
|
|
|
// Only the first frame can be hidden, so unhide unconditionally here.
|
2011-10-17 14:59:28 +00:00
|
|
|
decoder->mFrameIsHidden = false;
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2007-03-20 23:56:50 +00:00
|
|
|
x_offset = png_get_next_frame_x_offset(png_ptr, decoder->mInfo);
|
|
|
|
y_offset = png_get_next_frame_y_offset(png_ptr, decoder->mInfo);
|
|
|
|
width = png_get_next_frame_width(png_ptr, decoder->mInfo);
|
|
|
|
height = png_get_next_frame_height(png_ptr, decoder->mInfo);
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2007-03-20 23:56:50 +00:00
|
|
|
decoder->CreateFrame(x_offset, y_offset, width, height, decoder->format);
|
2010-01-05 21:46:26 +00:00
|
|
|
#endif
|
2007-03-20 23:56:50 +00:00
|
|
|
}
|
2001-01-22 22:01:03 +00:00
|
|
|
|
|
|
|
void
|
2010-08-23 02:30:46 +00:00
|
|
|
nsPNGDecoder::end_callback(png_structp png_ptr, png_infop info_ptr)
|
2001-01-22 22:01:03 +00:00
|
|
|
{
|
|
|
|
/* libpng comments:
|
|
|
|
*
|
|
|
|
* this function is called when the whole image has been read,
|
|
|
|
* including any chunks after the image (up to and including
|
|
|
|
* the IEND). You will usually have the same info chunk as you
|
|
|
|
* had in the header, although some data may have been added
|
|
|
|
* to the comments and time fields.
|
|
|
|
*
|
|
|
|
* Most people won't do much here, perhaps setting a flag that
|
|
|
|
* marks the image as finished.
|
|
|
|
*/
|
|
|
|
|
2009-12-04 02:41:00 +00:00
|
|
|
nsPNGDecoder *decoder =
|
|
|
|
static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
|
2009-09-12 22:44:18 +00:00
|
|
|
|
|
|
|
// We shouldn't get here if we've hit an error
|
2010-09-12 15:22:31 +00:00
|
|
|
NS_ABORT_IF_FALSE(!decoder->HasError(), "Finishing up PNG but hit error!");
|
2009-12-04 02:41:00 +00:00
|
|
|
|
2010-01-05 21:46:26 +00:00
|
|
|
#ifdef PNG_APNG_SUPPORTED
|
2007-03-21 19:12:00 +00:00
|
|
|
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_acTL)) {
|
2012-08-22 15:56:38 +00:00
|
|
|
int32_t num_plays = png_get_num_plays(png_ptr, info_ptr);
|
2011-09-29 13:17:13 +00:00
|
|
|
decoder->mImage.SetLoopCount(num_plays - 1);
|
2007-03-20 23:56:50 +00:00
|
|
|
}
|
2010-01-05 21:46:26 +00:00
|
|
|
#endif
|
2007-10-19 00:36:34 +00:00
|
|
|
|
2009-09-12 22:44:18 +00:00
|
|
|
// Send final notifications
|
2010-09-12 15:22:30 +00:00
|
|
|
decoder->EndImageFrame();
|
|
|
|
decoder->PostDecodeDone();
|
2001-01-22 22:01:03 +00:00
|
|
|
}
|
|
|
|
|
2002-09-23 17:34:21 +00:00
|
|
|
|
|
|
|
void
|
2010-08-23 02:30:46 +00:00
|
|
|
nsPNGDecoder::error_callback(png_structp png_ptr, png_const_charp error_msg)
|
2002-09-23 17:34:21 +00:00
|
|
|
{
|
2012-10-29 23:32:10 +00:00
|
|
|
PR_LOG(GetPNGLog(), PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
|
2010-01-05 21:46:26 +00:00
|
|
|
longjmp(png_jmpbuf(png_ptr), 1);
|
2002-09-23 17:34:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2010-08-23 02:30:46 +00:00
|
|
|
nsPNGDecoder::warning_callback(png_structp png_ptr, png_const_charp warning_msg)
|
2002-09-23 17:34:21 +00:00
|
|
|
{
|
2012-10-29 23:32:10 +00:00
|
|
|
PR_LOG(GetPNGLog(), PR_LOG_WARNING, ("libpng warning: %s\n", warning_msg));
|
2002-09-23 17:34:21 +00:00
|
|
|
}
|
2010-03-09 18:22:44 +00:00
|
|
|
|
2011-09-22 20:25:56 +00:00
|
|
|
Telemetry::ID
|
|
|
|
nsPNGDecoder::SpeedHistogram()
|
|
|
|
{
|
|
|
|
return Telemetry::IMAGE_DECODE_SPEED_PNG;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-01-06 16:02:27 +00:00
|
|
|
} // namespace image
|
2010-08-23 02:30:46 +00:00
|
|
|
} // namespace mozilla
|