* contrib/hbtip/encqp.prg
* QP decoder will now accept LF EOLs (to work well with
non-compliant mailers).
* external/libhpdf/hpdfpags.h
* external/libhpdf/hpdffdfb.c
* external/libhpdf/hpdfxref.c
* external/libhpdf/hpdfcons.h
* external/libhpdf/hpdfextg.c
* external/libhpdf/hpdfencc.c
* external/libhpdf/hpdffdfj.c
+ external/libhpdf/hpdfpdfa.c
* external/libhpdf/hpdfextg.h
* external/libhpdf/hpdfstre.c
* external/libhpdf/hpdffdfn.c
+ external/libhpdf/hpdfpdfa.h
* external/libhpdf/hpdffdf1.c
* external/libhpdf/hpdfenck.c
* external/libhpdf/hpdfstri.c
* external/libhpdf/hpdfstre.h
* external/libhpdf/hpdffdft.c
* external/libhpdf/hpdfoutl.c
* external/libhpdf/hpdfenco.c
* external/libhpdf/hpdfecyd.c
* external/libhpdf/hpdfimap.c
* external/libhpdf/hpdfoutl.h
* external/libhpdf/hpdfenco.h
* external/libhpdf/Makefile
* external/libhpdf/hpdffond.h
* external/libhpdf/hpdfency.h
* external/libhpdf/hpdffon1.c
* external/libhpdf/hpdffont.c
* external/libhpdf/hpdfcata.c
* external/libhpdf/hpdffont.h
* external/libhpdf/hpdfutil.c
* external/libhpdf/hpdfcata.h
* external/libhpdf/hpdfutil.h
* external/libhpdf/hpdfdict.c
* external/libhpdf/hpdfreal.c
* external/libhpdf/hpdfarra.c
* external/libhpdf/hpdfdocp.c
* external/libhpdf/libhpdf.dif
* external/libhpdf/hpdfconf.h
* external/libhpdf/hpdfinfo.c
* external/libhpdf/hpdfanno.c
* external/libhpdf/hpdfgsta.c
* external/libhpdf/hpdfdest.c
* external/libhpdf/hpdfinfo.h
* external/libhpdf/hpdfanno.h
* external/libhpdf/hpdfnumb.c
* external/libhpdf/hpdffdfc.c
* external/libhpdf/hpdfgsta.h
* external/libhpdf/hpdfdest.h
* external/libhpdf/hpdfdoc.c
* external/libhpdf/hpdferro.c
* external/libhpdf/hpdffdfi.c
* external/libhpdf/hpdfbina.c
* external/libhpdf/hpdfdoc.h
* external/libhpdf/hpdffdfk.c
* external/libhpdf/hpdflist.c
* external/libhpdf/hpdferro.h
* external/libhpdf/hpdfimag.c
* external/libhpdf/hpdfencj.c
* external/libhpdf/hpdflist.h
* external/libhpdf/hpdfecy.c
* external/libhpdf/hpdfimag.h
* external/libhpdf/hpdfencn.c
* external/libhpdf/hpdffonc.c
* external/libhpdf/hpdfu3d.c
* external/libhpdf/hpdfencr.h
* external/libhpdf/hpdffdf.c
* external/libhpdf/hpdfu3d.h
* external/libhpdf/hpdfmmgr.c
* external/libhpdf/hpdfmmgr.h
* external/libhpdf/hpdfnull.c
* external/libhpdf/README
* external/libhpdf/hpdffott.c
* external/libhpdf/hpdfpage.c
+ external/libhpdf/hpdfndic.c
* external/libhpdf/hpdfobje.c
* external/libhpdf/hpdfname.c
* external/libhpdf/hpdfpage.h
+ external/libhpdf/hpdfndic.h
* external/libhpdf/hpdf.h
* external/libhpdf/hpdfobje.h
* external/libhpdf/hpdfvers.h
* external/libhpdf/hpdfpago.c
* external/libhpdf/hpdftype.h
* external/libhpdf/hpdfpags.c
* external/libhpdf/hpdfbool.c
+ libharu updated to official 2.2.0 release (from 2.1.0).
Patch sent by Tamas Tevesz.
* Added new files to Makefile.
183 lines
4.3 KiB
C
183 lines
4.3 KiB
C
/*
|
|
* << Haru Free PDF Library >> -- hpdf_doc_png.c
|
|
*
|
|
* URL: http://libharu.org
|
|
*
|
|
* Copyright (c) 1999-2006 Takeshi Kanno <takeshi_kanno@est.hi-ho.ne.jp>
|
|
* Copyright (c) 2007-2009 Antony Dovgal <tony@daylessday.org>
|
|
*
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appear in all copies and
|
|
* that both that copyright notice and this permission notice appear
|
|
* in supporting documentation.
|
|
* It is provided "as is" without express or implied warranty.
|
|
*
|
|
*/
|
|
|
|
|
|
#include "hpdfconf.h"
|
|
#include "hpdfutil.h"
|
|
#include "hpdf.h"
|
|
#include "hpdfimag.h"
|
|
|
|
|
|
static HPDF_Image
|
|
LoadPngImageFromStream (HPDF_Doc pdf,
|
|
HPDF_Stream imagedata,
|
|
HPDF_BOOL delayed_loading);
|
|
|
|
HPDF_EXPORT(HPDF_Image)
|
|
HPDF_LoadPngImageFromMem (HPDF_Doc pdf,
|
|
const HPDF_BYTE *buffer,
|
|
HPDF_UINT size)
|
|
{
|
|
HPDF_Stream imagedata;
|
|
HPDF_Image image;
|
|
|
|
HPDF_PTRACE ((" HPDF_LoadPngImageFromFile\n"));
|
|
|
|
if (!HPDF_HasDoc (pdf)) {
|
|
return NULL;
|
|
}
|
|
|
|
/* create file stream */
|
|
imagedata = HPDF_MemStream_New (pdf->mmgr, size);
|
|
|
|
if (!HPDF_Stream_Validate (imagedata)) {
|
|
HPDF_RaiseError (&pdf->error, HPDF_INVALID_STREAM, 0);
|
|
return NULL;
|
|
}
|
|
|
|
if (HPDF_Stream_Write (imagedata, buffer, size) != HPDF_OK) {
|
|
HPDF_Stream_Free (imagedata);
|
|
return NULL;
|
|
}
|
|
|
|
image = LoadPngImageFromStream (pdf, imagedata, HPDF_FALSE);
|
|
|
|
/* destroy file stream */
|
|
HPDF_Stream_Free (imagedata);
|
|
|
|
if (!image) {
|
|
HPDF_CheckError (&pdf->error);
|
|
}
|
|
|
|
return image;
|
|
|
|
}
|
|
|
|
|
|
HPDF_EXPORT(HPDF_Image)
|
|
HPDF_LoadPngImageFromFile (HPDF_Doc pdf,
|
|
const char *filename)
|
|
{
|
|
HPDF_Stream imagedata;
|
|
HPDF_Image image;
|
|
|
|
HPDF_PTRACE ((" HPDF_LoadPngImageFromFile\n"));
|
|
|
|
if (!HPDF_HasDoc (pdf))
|
|
return NULL;
|
|
|
|
/* create file stream */
|
|
imagedata = HPDF_FileReader_New (pdf->mmgr, filename);
|
|
|
|
if (HPDF_Stream_Validate (imagedata))
|
|
image = LoadPngImageFromStream (pdf, imagedata, HPDF_FALSE);
|
|
else
|
|
image = NULL;
|
|
|
|
/* destroy file stream */
|
|
if (imagedata)
|
|
HPDF_Stream_Free (imagedata);
|
|
|
|
if (!image)
|
|
HPDF_CheckError (&pdf->error);
|
|
|
|
return image;
|
|
}
|
|
|
|
/* delaied loading version of HPDF_LoadPngImageFromFile */
|
|
HPDF_EXPORT(HPDF_Image)
|
|
HPDF_LoadPngImageFromFile2 (HPDF_Doc pdf,
|
|
const char *filename)
|
|
{
|
|
HPDF_Stream imagedata;
|
|
HPDF_Image image;
|
|
HPDF_String fname;
|
|
|
|
HPDF_PTRACE ((" HPDF_LoadPngImageFromFile\n"));
|
|
|
|
if (!HPDF_HasDoc (pdf))
|
|
return NULL;
|
|
|
|
/* check whether file name is valid or not. */
|
|
imagedata = HPDF_FileReader_New (pdf->mmgr, filename);
|
|
|
|
if (HPDF_Stream_Validate (imagedata))
|
|
image = LoadPngImageFromStream (pdf, imagedata, HPDF_TRUE);
|
|
else
|
|
image = NULL;
|
|
|
|
/* destroy file stream */
|
|
if (imagedata)
|
|
HPDF_Stream_Free (imagedata);
|
|
|
|
if (!image) {
|
|
HPDF_CheckError (&pdf->error);
|
|
return NULL;
|
|
}
|
|
|
|
/* add file-name to image dictionary as a hidden entry.
|
|
* it is used when the image data is needed.
|
|
*/
|
|
fname = HPDF_String_New (pdf->mmgr, filename, NULL);
|
|
if (!fname) {
|
|
HPDF_CheckError (&pdf->error);
|
|
return NULL;
|
|
}
|
|
|
|
fname->header.obj_id |= HPDF_OTYPE_HIDDEN;
|
|
|
|
if ((HPDF_Dict_Add (image, "_FILE_NAME", fname)) != HPDF_OK) {
|
|
HPDF_CheckError (&pdf->error);
|
|
return NULL;
|
|
}
|
|
|
|
return image;
|
|
}
|
|
|
|
#ifndef LIBHPDF_HAVE_NOPNGLIB
|
|
static HPDF_Image
|
|
LoadPngImageFromStream (HPDF_Doc pdf,
|
|
HPDF_Stream imagedata,
|
|
HPDF_BOOL delayed_loading)
|
|
{
|
|
HPDF_Image image;
|
|
|
|
HPDF_PTRACE ((" HPDF_LoadPngImageFromStream\n"));
|
|
|
|
image = HPDF_Image_LoadPngImage (pdf->mmgr, imagedata, pdf->xref,
|
|
delayed_loading);
|
|
|
|
if (image && (pdf->compression_mode & HPDF_COMP_IMAGE))
|
|
image->filter = HPDF_STREAM_FILTER_FLATE_DECODE;
|
|
|
|
return image;
|
|
}
|
|
|
|
#else
|
|
static HPDF_Image
|
|
LoadPngImageFromStream (HPDF_Doc pdf,
|
|
HPDF_Stream imagedata,
|
|
HPDF_BOOL delayed_loading)
|
|
{
|
|
HPDF_SetError (&pdf->error, HPDF_UNSUPPORTED_FUNC, 0);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
#endif /* LIBHPDF_HAVE_NOPNGLIB */
|
|
|