png fixes

This commit is contained in:
David Rose 2008-10-10 15:07:35 +00:00
parent 2e8ad41bc7
commit 8f8d56b530
2 changed files with 11 additions and 2 deletions

View File

@ -16,6 +16,14 @@
#define CONFIG_PNMIMAGETYPES_H
#include "pandabase.h"
#ifdef HAVE_PNG
// If we are going to be including png.h (in the unrelated file
// pnmFileTypePNG.h), be sure to include it before including setjmp.h.
// Ugly hack due to png weirdness with setjmp.
#include <png.h>
#endif
#include "notifyCategoryProxy.h"
#include "configVariableInt.h"
#include "configVariableString.h"

View File

@ -19,12 +19,13 @@
#ifdef HAVE_PNG
// Must be first.
#include <png.h>
#include "pnmFileType.h"
#include "pnmReader.h"
#include "pnmWriter.h"
#include <png.h>
////////////////////////////////////////////////////////////////////
// Class : PNMFileTypePNG
// Description : For reading and writing PNG files.