Merged 1.4 branch, revisions 1106:1132.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1133 dfc29bdd-3216-0410-991c-e03cc46cb475master
hybrid
parent
0dffdd46a6
commit
99fd5bcc7c
|
|
@ -32,7 +32,7 @@ LDFLAGS = $(USERLDFLAGS)
|
||||||
all: all_linux
|
all: all_linux
|
||||||
|
|
||||||
# target specific settings
|
# target specific settings
|
||||||
all_linux all_win32 static_win32: LDFLAGS = -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
|
all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
|
||||||
all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11
|
all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11
|
||||||
all_linux clean_linux: SYSTEM=Linux
|
all_linux clean_linux: SYSTEM=Linux
|
||||||
all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
|
all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
|
||||||
|
|
|
||||||
|
|
@ -73,10 +73,10 @@ int main()
|
||||||
is a class which can fetch the triangles from scene nodes for doing different
|
is a class which can fetch the triangles from scene nodes for doing different
|
||||||
things with them, for example collision detection. There are different triangle
|
things with them, for example collision detection. There are different triangle
|
||||||
selectors, and all can be created with the ISceneManager. In this example,
|
selectors, and all can be created with the ISceneManager. In this example,
|
||||||
we create an OctTreeTriangleSelector, which optimizes the triangle output a l
|
we create an OctTreeTriangleSelector, which optimizes the triangle output a
|
||||||
little bit by reducing it like an octree. This is very useful for huge meshes
|
little bit by reducing it like an octree. This is very useful for huge meshes
|
||||||
like quake 3 levels.
|
like quake 3 levels.
|
||||||
Afte we created the triangle selector, we attach it to the q3node. This is not
|
After we created the triangle selector, we attach it to the q3node. This is not
|
||||||
necessary, but in this way, we do not need to care for the selector, for example
|
necessary, but in this way, we do not need to care for the selector, for example
|
||||||
dropping it after we do not need it anymore.
|
dropping it after we do not need it anymore.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -185,7 +185,8 @@ int main()
|
||||||
smgr->drawAll();
|
smgr->drawAll();
|
||||||
|
|
||||||
// set back old render target
|
// set back old render target
|
||||||
driver->setRenderTarget(0);
|
// The buffer might have been distorted, so clear it
|
||||||
|
driver->setRenderTarget(0, true, true, 0);
|
||||||
|
|
||||||
// make the cube visible and set the user controlled camera as active one
|
// make the cube visible and set the user controlled camera as active one
|
||||||
test->setVisible(true);
|
test->setVisible(true);
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ CMainMenu::CMainMenu()
|
||||||
bool CMainMenu::run(bool& outFullscreen, bool& outMusic, bool& outShadows,
|
bool CMainMenu::run(bool& outFullscreen, bool& outMusic, bool& outShadows,
|
||||||
bool& outAdditive, bool &outVSync, video::E_DRIVER_TYPE& outDriver)
|
bool& outAdditive, bool &outVSync, video::E_DRIVER_TYPE& outDriver)
|
||||||
{
|
{
|
||||||
device = createDevice( video::EDT_BURNINGSVIDEO,
|
device = createDevice( outDriver, //Varmint: 2007/12/18 video::EDT_BURNINGSVIDEO,
|
||||||
core::dimension2d<s32>(512, 384), 16, false, false, false, this);
|
core::dimension2d<s32>(512, 384), 16, false, false, false, this);
|
||||||
|
|
||||||
device->getFileSystem()->addZipFileArchive("irrlicht.dat");
|
device->getFileSystem()->addZipFileArchive("irrlicht.dat");
|
||||||
|
|
|
||||||
|
|
@ -966,7 +966,7 @@ void C3DSMeshFileLoader::composeObject(io::IReadFile* file, const core::stringc&
|
||||||
mb->drop();
|
mb->drop();
|
||||||
Mesh->MeshBuffers[mbPos] = Mesh->MeshBuffers.getLast();
|
Mesh->MeshBuffers[mbPos] = Mesh->MeshBuffers.getLast();
|
||||||
Mesh->MeshBuffers[Mesh->MeshBuffers.size()-1] = tmp;
|
Mesh->MeshBuffers[Mesh->MeshBuffers.size()-1] = tmp;
|
||||||
mb->getMaterial() = *mat;
|
mb->getMaterial() = tmp->getMaterial();
|
||||||
vtxCount=0;
|
vtxCount=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -214,11 +214,11 @@ IAnimatedMesh* CDMFLoader::createMesh(io::IReadFile* file)
|
||||||
}
|
}
|
||||||
|
|
||||||
for (u32 j=0; j<filepath.size()-1; ++j)
|
for (u32 j=0; j<filepath.size()-1; ++j)
|
||||||
path = path + filepath[j] + String("\\");
|
path = path + filepath[j] + String("/");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
path = path +
|
path = path +
|
||||||
String( SceneMgr->getParameters()->getAttributeAsString(DMF_TEXTURE_PATH)) + String("\\");
|
String( SceneMgr->getParameters()->getAttributeAsString(DMF_TEXTURE_PATH)) + String("/");
|
||||||
|
|
||||||
//texture and lightmap
|
//texture and lightmap
|
||||||
ITexture *tex = 0;
|
ITexture *tex = 0;
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,51 @@
|
||||||
#include "COpenGLDriver.h"
|
#include "COpenGLDriver.h"
|
||||||
#include "IMaterialRenderer.h"
|
#include "IMaterialRenderer.h"
|
||||||
|
|
||||||
|
//Varmint: 2007/12/18
|
||||||
|
#ifdef MACOSX
|
||||||
|
#define GL_COMBINE_EXT 0x8570
|
||||||
|
#define GL_COMBINE_RGB_EXT 0x8571
|
||||||
|
#define GL_COMBINE_ALPHA_EXT 0x8572
|
||||||
|
#define GL_RGB_SCALE_EXT 0x8573
|
||||||
|
#define GL_ADD_SIGNED_EXT 0x8574
|
||||||
|
#define GL_INTERPOLATE_EXT 0x8575
|
||||||
|
#define GL_CONSTANT_EXT 0x8576
|
||||||
|
#define GL_PRIMARY_COLOR_EXT 0x8577
|
||||||
|
#define GL_PREVIOUS_EXT 0x8578
|
||||||
|
#define GL_SOURCE0_RGB_EXT 0x8580
|
||||||
|
#define GL_SOURCE1_RGB_EXT 0x8581
|
||||||
|
#define GL_SOURCE2_RGB_EXT 0x8582
|
||||||
|
#define GL_SOURCE3_RGB_EXT 0x8583
|
||||||
|
#define GL_SOURCE4_RGB_EXT 0x8584
|
||||||
|
#define GL_SOURCE5_RGB_EXT 0x8585
|
||||||
|
#define GL_SOURCE6_RGB_EXT 0x8586
|
||||||
|
#define GL_SOURCE7_RGB_EXT 0x8587
|
||||||
|
#define GL_SOURCE0_ALPHA_EXT 0x8588
|
||||||
|
#define GL_SOURCE1_ALPHA_EXT 0x8589
|
||||||
|
#define GL_SOURCE2_ALPHA_EXT 0x858A
|
||||||
|
#define GL_SOURCE3_ALPHA_EXT 0x858B
|
||||||
|
#define GL_SOURCE4_ALPHA_EXT 0x858C
|
||||||
|
#define GL_SOURCE5_ALPHA_EXT 0x858D
|
||||||
|
#define GL_SOURCE6_ALPHA_EXT 0x858E
|
||||||
|
#define GL_SOURCE7_ALPHA_EXT 0x858F
|
||||||
|
#define GL_OPERAND0_RGB_EXT 0x8590
|
||||||
|
#define GL_OPERAND1_RGB_EXT 0x8591
|
||||||
|
#define GL_OPERAND2_RGB_EXT 0x8592
|
||||||
|
#define GL_OPERAND3_RGB_EXT 0x8593
|
||||||
|
#define GL_OPERAND4_RGB_EXT 0x8594
|
||||||
|
#define GL_OPERAND5_RGB_EXT 0x8595
|
||||||
|
#define GL_OPERAND6_RGB_EXT 0x8596
|
||||||
|
#define GL_OPERAND7_RGB_EXT 0x8597
|
||||||
|
#define GL_OPERAND0_ALPHA_EXT 0x8598
|
||||||
|
#define GL_OPERAND1_ALPHA_EXT 0x8599
|
||||||
|
#define GL_OPERAND2_ALPHA_EXT 0x859A
|
||||||
|
#define GL_OPERAND3_ALPHA_EXT 0x859B
|
||||||
|
#define GL_OPERAND4_ALPHA_EXT 0x859C
|
||||||
|
#define GL_OPERAND5_ALPHA_EXT 0x859D
|
||||||
|
#define GL_OPERAND6_ALPHA_EXT 0x859E
|
||||||
|
#define GL_OPERAND7_ALPHA_EXT 0x859F
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace irr
|
namespace irr
|
||||||
{
|
{
|
||||||
namespace video
|
namespace video
|
||||||
|
|
|
||||||
|
|
@ -703,6 +703,13 @@ ITerrainSceneNode* CSceneManager::addTerrainSceneNode(
|
||||||
{
|
{
|
||||||
io::IReadFile* file = FileSystem->createAndOpenFile(heightMapFileName);
|
io::IReadFile* file = FileSystem->createAndOpenFile(heightMapFileName);
|
||||||
|
|
||||||
|
if(!file && !addAlsoIfHeightmapEmpty)
|
||||||
|
{
|
||||||
|
os::Printer::log("Could not load terrain, because file could not be opened.",
|
||||||
|
heightMapFileName, ELL_ERROR);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
ITerrainSceneNode* terrain = addTerrainSceneNode(file, parent, id,
|
ITerrainSceneNode* terrain = addTerrainSceneNode(file, parent, id,
|
||||||
position, rotation, scale, vertexColor, maxLOD, patchSize,
|
position, rotation, scale, vertexColor, maxLOD, patchSize,
|
||||||
smoothFactor, addAlsoIfHeightmapEmpty);
|
smoothFactor, addAlsoIfHeightmapEmpty);
|
||||||
|
|
@ -730,8 +737,7 @@ ITerrainSceneNode* CSceneManager::addTerrainSceneNode(
|
||||||
|
|
||||||
if (!heightMapFile && !addAlsoIfHeightmapEmpty)
|
if (!heightMapFile && !addAlsoIfHeightmapEmpty)
|
||||||
{
|
{
|
||||||
os::Printer::log("Could not load terrain, because file could not be opened.",
|
os::Printer::log("Could not load terrain, because file could not be opened.", ELL_ERROR);
|
||||||
heightMapFile->getFileName(), ELL_ERROR);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,10 +54,8 @@ namespace scene
|
||||||
//! destructor
|
//! destructor
|
||||||
CTerrainSceneNode::~CTerrainSceneNode ( )
|
CTerrainSceneNode::~CTerrainSceneNode ( )
|
||||||
{
|
{
|
||||||
if (TerrainData.LODDistanceThreshold)
|
|
||||||
delete [] TerrainData.LODDistanceThreshold;
|
delete [] TerrainData.LODDistanceThreshold;
|
||||||
|
|
||||||
if (TerrainData.Patches)
|
|
||||||
delete [] TerrainData.Patches;
|
delete [] TerrainData.Patches;
|
||||||
|
|
||||||
if (FileSystem)
|
if (FileSystem)
|
||||||
|
|
@ -525,67 +523,6 @@ namespace scene
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CTerrainSceneNode::preRenderLODCalculations_old()
|
|
||||||
{
|
|
||||||
SceneManager->registerNodeForRendering( this );
|
|
||||||
// Do Not call ISceneNode::OnRegisterSceneNode ( ), this node should have no children
|
|
||||||
|
|
||||||
// Determine the camera rotation, based on the camera direction.
|
|
||||||
core::line3d<f32> line;
|
|
||||||
line.start = SceneManager->getActiveCamera()->getAbsolutePosition();
|
|
||||||
line.end = SceneManager->getActiveCamera()->getTarget();
|
|
||||||
core::vector3df cameraRotation = line.getVector().getHorizontalAngle();
|
|
||||||
core::vector3df cameraPosition = SceneManager->getActiveCamera()->getPosition ( );
|
|
||||||
|
|
||||||
// Only check on the Camera's Y Rotation
|
|
||||||
if (( fabs(cameraRotation.X - OldCameraRotation.X) < CameraRotationDelta) &&
|
|
||||||
( fabs(cameraRotation.Y - OldCameraRotation.Y) < CameraRotationDelta))
|
|
||||||
{
|
|
||||||
if ((fabs(cameraPosition.X - OldCameraPosition.X) < CameraMovementDelta) &&
|
|
||||||
(fabs(cameraPosition.Y - OldCameraPosition.Y) < CameraMovementDelta) &&
|
|
||||||
(fabs(cameraPosition.Z - OldCameraPosition.Z) < CameraMovementDelta))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
OldCameraPosition = cameraPosition;
|
|
||||||
OldCameraRotation = cameraRotation;
|
|
||||||
const SViewFrustum* frustum = SceneManager->getActiveCamera()->getViewFrustum();
|
|
||||||
|
|
||||||
// Determine each patches LOD based on distance from camera ( and whether or not they are in
|
|
||||||
// the view frustum ).
|
|
||||||
for( s32 j = 0; j < TerrainData.PatchCount * TerrainData.PatchCount; ++j )
|
|
||||||
{
|
|
||||||
if( frustum->getBoundingBox().intersectsWithBox( TerrainData.Patches[j].BoundingBox ) )
|
|
||||||
{
|
|
||||||
f32 distance = (cameraPosition.X - TerrainData.Patches[j].Center.X) * (cameraPosition.X - TerrainData.Patches[j].Center.X) +
|
|
||||||
(cameraPosition.Y - TerrainData.Patches[j].Center.Y) * (cameraPosition.Y - TerrainData.Patches[j].Center.Y) +
|
|
||||||
(cameraPosition.Z - TerrainData.Patches[j].Center.Z) * (cameraPosition.Z - TerrainData.Patches[j].Center.Z);
|
|
||||||
|
|
||||||
for( s32 i = TerrainData.MaxLOD - 1; i >= 0; --i )
|
|
||||||
{
|
|
||||||
if( distance >= TerrainData.LODDistanceThreshold[i] )
|
|
||||||
{
|
|
||||||
TerrainData.Patches[j].CurrentLOD = i;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
//else if( i == 0 )
|
|
||||||
{
|
|
||||||
// If we've turned off a patch from viewing, because of the frustum, and now we turn around and it's
|
|
||||||
// too close, we need to turn it back on, at the highest LOD. The if above doesn't catch this.
|
|
||||||
TerrainData.Patches[j].CurrentLOD = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
TerrainData.Patches[j].CurrentLOD = -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void CTerrainSceneNode::preRenderIndicesCalculations()
|
void CTerrainSceneNode::preRenderIndicesCalculations()
|
||||||
{
|
{
|
||||||
IndicesToRender = 0;
|
IndicesToRender = 0;
|
||||||
|
|
@ -935,8 +872,8 @@ namespace scene
|
||||||
}
|
}
|
||||||
|
|
||||||
//! used to get the indices when generating index data for patches at varying levels of detail.
|
//! used to get the indices when generating index data for patches at varying levels of detail.
|
||||||
u32 CTerrainSceneNode::getIndex(const s32& PatchX, const s32& PatchZ,
|
u32 CTerrainSceneNode::getIndex(const s32 PatchX, const s32 PatchZ,
|
||||||
const s32& PatchIndex, u32 vX, u32 vZ) const
|
const s32 PatchIndex, u32 vX, u32 vZ) const
|
||||||
{
|
{
|
||||||
// top border
|
// top border
|
||||||
if (vZ == 0)
|
if (vZ == 0)
|
||||||
|
|
@ -945,7 +882,7 @@ namespace scene
|
||||||
TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Top->CurrentLOD &&
|
TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Top->CurrentLOD &&
|
||||||
(vX % ( 1 << TerrainData.Patches[PatchIndex].Top->CurrentLOD)) != 0 )
|
(vX % ( 1 << TerrainData.Patches[PatchIndex].Top->CurrentLOD)) != 0 )
|
||||||
{
|
{
|
||||||
vX = vX - vX % ( 1 << TerrainData.Patches[PatchIndex].Top->CurrentLOD );
|
vX -= vX % ( 1 << TerrainData.Patches[PatchIndex].Top->CurrentLOD );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -955,7 +892,7 @@ namespace scene
|
||||||
TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Bottom->CurrentLOD &&
|
TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Bottom->CurrentLOD &&
|
||||||
(vX % ( 1 << TerrainData.Patches[PatchIndex].Bottom->CurrentLOD)) != 0)
|
(vX % ( 1 << TerrainData.Patches[PatchIndex].Bottom->CurrentLOD)) != 0)
|
||||||
{
|
{
|
||||||
vX = vX - vX % ( 1 << TerrainData.Patches[PatchIndex].Bottom->CurrentLOD );
|
vX -= vX % ( 1 << TerrainData.Patches[PatchIndex].Bottom->CurrentLOD );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -966,7 +903,7 @@ namespace scene
|
||||||
TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Left->CurrentLOD &&
|
TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Left->CurrentLOD &&
|
||||||
( vZ % ( 1 << TerrainData.Patches[PatchIndex].Left->CurrentLOD ) ) != 0)
|
( vZ % ( 1 << TerrainData.Patches[PatchIndex].Left->CurrentLOD ) ) != 0)
|
||||||
{
|
{
|
||||||
vZ = vZ - vZ % ( 1 << TerrainData.Patches[PatchIndex].Left->CurrentLOD );
|
vZ -= vZ % ( 1 << TerrainData.Patches[PatchIndex].Left->CurrentLOD );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -976,7 +913,7 @@ namespace scene
|
||||||
TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Right->CurrentLOD &&
|
TerrainData.Patches[PatchIndex].CurrentLOD < TerrainData.Patches[PatchIndex].Right->CurrentLOD &&
|
||||||
( vZ % ( 1 << TerrainData.Patches[PatchIndex].Right->CurrentLOD ) ) != 0)
|
( vZ % ( 1 << TerrainData.Patches[PatchIndex].Right->CurrentLOD ) ) != 0)
|
||||||
{
|
{
|
||||||
vZ = vZ - vZ % ( 1 << TerrainData.Patches[PatchIndex].Right->CurrentLOD );
|
vZ -= vZ % ( 1 << TerrainData.Patches[PatchIndex].Right->CurrentLOD );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1175,12 +1112,6 @@ namespace scene
|
||||||
TerrainData.Patches[index].Right = &TerrainData.Patches[x * TerrainData.PatchCount + z + 1];
|
TerrainData.Patches[index].Right = &TerrainData.Patches[x * TerrainData.PatchCount + z + 1];
|
||||||
else
|
else
|
||||||
TerrainData.Patches[index].Right = 0;
|
TerrainData.Patches[index].Right = 0;
|
||||||
|
|
||||||
if ( TerrainData.Patches[index].DebugText )
|
|
||||||
{
|
|
||||||
TerrainData.Patches[index].DebugText->setPosition ( TerrainData.Patches[index].Center );
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1225,7 +1156,7 @@ namespace scene
|
||||||
TerrainData.Patches[i].CurrentLOD = lod;
|
TerrainData.Patches[i].CurrentLOD = lod;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CTerrainSceneNode::setCurrentLODOfPatches(core::array<s32>& lodarray)
|
void CTerrainSceneNode::setCurrentLODOfPatches(const core::array<s32>& lodarray)
|
||||||
{
|
{
|
||||||
for (s32 i=0; i<TerrainData.PatchCount * TerrainData.PatchCount; ++i)
|
for (s32 i=0; i<TerrainData.PatchCount * TerrainData.PatchCount; ++i)
|
||||||
TerrainData.Patches[i].CurrentLOD = lodarray[i];
|
TerrainData.Patches[i].CurrentLOD = lodarray[i];
|
||||||
|
|
|
||||||
|
|
@ -102,8 +102,7 @@ namespace scene
|
||||||
//! \param rotation: New rotation of the node in degrees.
|
//! \param rotation: New rotation of the node in degrees.
|
||||||
virtual void setRotation(const core::vector3df& rotation);
|
virtual void setRotation(const core::vector3df& rotation);
|
||||||
|
|
||||||
//! Sets the pivot point for rotation of this node. This is useful for the TiledTerrainManager to
|
//! Sets the pivot point for rotation of this node.
|
||||||
//! rotate all terrain tiles around a global world point.
|
|
||||||
//! NOTE: The default for the RotationPivot will be the center of the individual tile.
|
//! NOTE: The default for the RotationPivot will be the center of the individual tile.
|
||||||
virtual void setRotationPivot( const core::vector3df& pivot );
|
virtual void setRotationPivot( const core::vector3df& pivot );
|
||||||
|
|
||||||
|
|
@ -152,7 +151,7 @@ namespace scene
|
||||||
//! \param LOD: The level of detail to get for that patch. If -1, then get
|
//! \param LOD: The level of detail to get for that patch. If -1, then get
|
||||||
//! the CurrentLOD. If the CurrentLOD is set to -1, meaning it's not shown,
|
//! the CurrentLOD. If the CurrentLOD is set to -1, meaning it's not shown,
|
||||||
//! then it will retrieve the triangles at the highest LOD ( 0 ).
|
//! then it will retrieve the triangles at the highest LOD ( 0 ).
|
||||||
//! \return: Number if indices put into the buffer.
|
//! \return: Number of indices put into the buffer.
|
||||||
virtual s32 getIndicesForPatch(core::array<u32>& indices,
|
virtual s32 getIndicesForPatch(core::array<u32>& indices,
|
||||||
s32 patchX, s32 patchZ, s32 LOD = 0 );
|
s32 patchX, s32 patchZ, s32 LOD = 0 );
|
||||||
|
|
||||||
|
|
@ -225,20 +224,17 @@ namespace scene
|
||||||
private:
|
private:
|
||||||
|
|
||||||
friend class CTerrainTriangleSelector;
|
friend class CTerrainTriangleSelector;
|
||||||
friend class CTiledTerrainSceneNodeManager;
|
|
||||||
|
|
||||||
struct SPatch
|
struct SPatch
|
||||||
{
|
{
|
||||||
SPatch()
|
SPatch()
|
||||||
: CurrentLOD(-1), DebugText(0),
|
: CurrentLOD(-1), Top(0), Bottom(0), Right(0), Left(0)
|
||||||
Top(0), Bottom(0), Right(0), Left(0)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
s32 CurrentLOD;
|
s32 CurrentLOD;
|
||||||
core::aabbox3df BoundingBox;
|
core::aabbox3df BoundingBox;
|
||||||
core::vector3df Center;
|
core::vector3df Center;
|
||||||
scene::ITextSceneNode* DebugText;
|
|
||||||
SPatch* Top;
|
SPatch* Top;
|
||||||
SPatch* Bottom;
|
SPatch* Bottom;
|
||||||
SPatch* Right;
|
SPatch* Right;
|
||||||
|
|
@ -280,11 +276,10 @@ namespace scene
|
||||||
};
|
};
|
||||||
|
|
||||||
virtual void preRenderLODCalculations();
|
virtual void preRenderLODCalculations();
|
||||||
virtual void preRenderLODCalculations_old();
|
|
||||||
virtual void preRenderIndicesCalculations();
|
virtual void preRenderIndicesCalculations();
|
||||||
|
|
||||||
//! get indices when generating index data for patches at varying levels of detail.
|
//! get indices when generating index data for patches at varying levels of detail.
|
||||||
u32 getIndex(const s32& PatchX, const s32& PatchZ, const s32& PatchIndex, u32 vX, u32 vZ) const;
|
u32 getIndex(const s32 PatchX, const s32 PatchZ, const s32 PatchIndex, u32 vX, u32 vZ) const;
|
||||||
|
|
||||||
//! calculate smooth normals
|
//! calculate smooth normals
|
||||||
void calculateNormals(SMeshBufferLightMap* pMeshBuffer );
|
void calculateNormals(SMeshBufferLightMap* pMeshBuffer );
|
||||||
|
|
@ -302,7 +297,7 @@ namespace scene
|
||||||
void setCurrentLODOfPatches(s32 i);
|
void setCurrentLODOfPatches(s32 i);
|
||||||
|
|
||||||
//! sets the CurrentLOD of TerrainData patches to the LODs specified in the array
|
//! sets the CurrentLOD of TerrainData patches to the LODs specified in the array
|
||||||
void setCurrentLODOfPatches(core::array<s32>& lodarray);
|
void setCurrentLODOfPatches(const core::array<s32>& lodarray);
|
||||||
|
|
||||||
//! Apply transformation changes( scale, position, rotation )
|
//! Apply transformation changes( scale, position, rotation )
|
||||||
void applyTransformation();
|
void applyTransformation();
|
||||||
|
|
|
||||||
|
|
@ -33,8 +33,61 @@
|
||||||
/* End PBXAggregateTarget section */
|
/* End PBXAggregateTarget section */
|
||||||
|
|
||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
|
09198F100D188481001F5EF8 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F000D188481001F5EF8 /* png.c */; };
|
||||||
|
09198F110D188481001F5EF8 /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F010D188481001F5EF8 /* pngerror.c */; };
|
||||||
|
09198F120D188481001F5EF8 /* pnggccrd.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F020D188481001F5EF8 /* pnggccrd.c */; };
|
||||||
|
09198F130D188481001F5EF8 /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F030D188481001F5EF8 /* pngget.c */; };
|
||||||
|
09198F140D188481001F5EF8 /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F040D188481001F5EF8 /* pngmem.c */; };
|
||||||
|
09198F150D188481001F5EF8 /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F050D188481001F5EF8 /* pngpread.c */; };
|
||||||
|
09198F160D188481001F5EF8 /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F060D188481001F5EF8 /* pngread.c */; };
|
||||||
|
09198F170D188481001F5EF8 /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F070D188481001F5EF8 /* pngrio.c */; };
|
||||||
|
09198F180D188481001F5EF8 /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F080D188481001F5EF8 /* pngrtran.c */; };
|
||||||
|
09198F190D188481001F5EF8 /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F090D188481001F5EF8 /* pngrutil.c */; };
|
||||||
|
09198F1A0D188481001F5EF8 /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F0A0D188481001F5EF8 /* pngset.c */; };
|
||||||
|
09198F1B0D188481001F5EF8 /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F0B0D188481001F5EF8 /* pngtrans.c */; };
|
||||||
|
09198F1C0D188481001F5EF8 /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F0C0D188481001F5EF8 /* pngwio.c */; };
|
||||||
|
09198F1D0D188481001F5EF8 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F0D0D188481001F5EF8 /* pngwrite.c */; };
|
||||||
|
09198F1E0D188481001F5EF8 /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F0E0D188481001F5EF8 /* pngwtran.c */; };
|
||||||
|
09198F1F0D188481001F5EF8 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 09198F0F0D188481001F5EF8 /* pngwutil.c */; };
|
||||||
|
096840470D0F1A2300333EFD /* CB3DMeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0968401E0D0F1A2300333EFD /* CB3DMeshFileLoader.cpp */; };
|
||||||
|
096840480D0F1A2300333EFD /* CB3DMeshFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0968401F0D0F1A2300333EFD /* CB3DMeshFileLoader.h */; };
|
||||||
|
096840490D0F1A2300333EFD /* CBoneSceneNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840200D0F1A2300333EFD /* CBoneSceneNode.cpp */; };
|
||||||
|
0968404A0D0F1A2300333EFD /* CBoneSceneNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840210D0F1A2300333EFD /* CBoneSceneNode.h */; };
|
||||||
|
0968404B0D0F1A2300333EFD /* CBSPMeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840220D0F1A2300333EFD /* CBSPMeshFileLoader.cpp */; };
|
||||||
|
0968404C0D0F1A2300333EFD /* CBSPMeshFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840230D0F1A2300333EFD /* CBSPMeshFileLoader.h */; };
|
||||||
|
0968404E0D0F1A2300333EFD /* CColladaMeshWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840250D0F1A2300333EFD /* CColladaMeshWriter.cpp */; };
|
||||||
|
0968404F0D0F1A2300333EFD /* CColladaMeshWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840260D0F1A2300333EFD /* CColladaMeshWriter.h */; };
|
||||||
|
096840500D0F1A2300333EFD /* CImageLoaderPPM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840270D0F1A2300333EFD /* CImageLoaderPPM.cpp */; };
|
||||||
|
096840510D0F1A2300333EFD /* CImageLoaderPPM.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840280D0F1A2300333EFD /* CImageLoaderPPM.h */; };
|
||||||
|
096840540D0F1A2300333EFD /* CIrrMeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0968402B0D0F1A2300333EFD /* CIrrMeshFileLoader.cpp */; };
|
||||||
|
096840550D0F1A2300333EFD /* CIrrMeshFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0968402C0D0F1A2300333EFD /* CIrrMeshFileLoader.h */; };
|
||||||
|
096840560D0F1A2300333EFD /* CIrrMeshWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0968402D0D0F1A2300333EFD /* CIrrMeshWriter.cpp */; };
|
||||||
|
096840570D0F1A2300333EFD /* CIrrMeshWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0968402E0D0F1A2300333EFD /* CIrrMeshWriter.h */; };
|
||||||
|
096840580D0F1A2300333EFD /* CMD2MeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0968402F0D0F1A2300333EFD /* CMD2MeshFileLoader.cpp */; };
|
||||||
|
096840590D0F1A2300333EFD /* CMD2MeshFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840300D0F1A2300333EFD /* CMD2MeshFileLoader.h */; };
|
||||||
|
0968405A0D0F1A2300333EFD /* CMS3DMeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840310D0F1A2300333EFD /* CMS3DMeshFileLoader.cpp */; };
|
||||||
|
0968405B0D0F1A2300333EFD /* CMS3DMeshFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840320D0F1A2300333EFD /* CMS3DMeshFileLoader.h */; };
|
||||||
|
0968405C0D0F1A2300333EFD /* CParticleAnimatedMeshSceneNodeEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840330D0F1A2300333EFD /* CParticleAnimatedMeshSceneNodeEmitter.cpp */; };
|
||||||
|
0968405D0D0F1A2300333EFD /* CParticleAnimatedMeshSceneNodeEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840340D0F1A2300333EFD /* CParticleAnimatedMeshSceneNodeEmitter.h */; };
|
||||||
|
0968405E0D0F1A2300333EFD /* CParticleAttractionAffector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840350D0F1A2300333EFD /* CParticleAttractionAffector.cpp */; };
|
||||||
|
0968405F0D0F1A2300333EFD /* CParticleAttractionAffector.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840360D0F1A2300333EFD /* CParticleAttractionAffector.h */; };
|
||||||
|
096840600D0F1A2300333EFD /* CParticleCylinderEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840370D0F1A2300333EFD /* CParticleCylinderEmitter.cpp */; };
|
||||||
|
096840610D0F1A2300333EFD /* CParticleCylinderEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840380D0F1A2300333EFD /* CParticleCylinderEmitter.h */; };
|
||||||
|
096840620D0F1A2300333EFD /* CParticleMeshEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840390D0F1A2300333EFD /* CParticleMeshEmitter.cpp */; };
|
||||||
|
096840630D0F1A2300333EFD /* CParticleMeshEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0968403A0D0F1A2300333EFD /* CParticleMeshEmitter.h */; };
|
||||||
|
096840640D0F1A2300333EFD /* CParticleRingEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0968403B0D0F1A2300333EFD /* CParticleRingEmitter.cpp */; };
|
||||||
|
096840650D0F1A2300333EFD /* CParticleRingEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 0968403C0D0F1A2300333EFD /* CParticleRingEmitter.h */; };
|
||||||
|
096840660D0F1A2300333EFD /* CParticleRotationAffector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0968403D0D0F1A2300333EFD /* CParticleRotationAffector.cpp */; };
|
||||||
|
096840670D0F1A2300333EFD /* CParticleRotationAffector.h in Headers */ = {isa = PBXBuildFile; fileRef = 0968403E0D0F1A2300333EFD /* CParticleRotationAffector.h */; };
|
||||||
|
096840680D0F1A2300333EFD /* CParticleSphereEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0968403F0D0F1A2300333EFD /* CParticleSphereEmitter.cpp */; };
|
||||||
|
096840690D0F1A2300333EFD /* CParticleSphereEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840400D0F1A2300333EFD /* CParticleSphereEmitter.h */; };
|
||||||
|
0968406A0D0F1A2300333EFD /* CSkinnedMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840410D0F1A2300333EFD /* CSkinnedMesh.cpp */; };
|
||||||
|
0968406B0D0F1A2300333EFD /* CSkinnedMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840420D0F1A2300333EFD /* CSkinnedMesh.h */; };
|
||||||
|
0968406C0D0F1A2300333EFD /* CSTLMeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840430D0F1A2300333EFD /* CSTLMeshFileLoader.cpp */; };
|
||||||
|
0968406D0D0F1A2300333EFD /* CSTLMeshFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840440D0F1A2300333EFD /* CSTLMeshFileLoader.h */; };
|
||||||
|
0968406E0D0F1A2300333EFD /* CSTLMeshWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 096840450D0F1A2300333EFD /* CSTLMeshWriter.cpp */; };
|
||||||
|
0968406F0D0F1A2300333EFD /* CSTLMeshWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 096840460D0F1A2300333EFD /* CSTLMeshWriter.h */; };
|
||||||
4C364EA40A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C364EA20A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp */; };
|
4C364EA40A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C364EA20A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp */; };
|
||||||
4C43EEBC0A74A5A300F942FC /* CAnimatedMeshB3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C43EEBB0A74A5A300F942FC /* CAnimatedMeshB3d.cpp */; };
|
|
||||||
4C43EEC00A74A5C800F942FC /* CPakReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */; };
|
4C43EEC00A74A5C800F942FC /* CPakReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */; };
|
||||||
4C53E2500A48504D0014E966 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C0054770A48470500C844C2 /* main.cpp */; };
|
4C53E2500A48504D0014E966 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C0054770A48470500C844C2 /* main.cpp */; };
|
||||||
4C53E2510A4850550014E966 /* libIrrlicht.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C53E24D0A4850120014E966 /* libIrrlicht.a */; };
|
4C53E2510A4850550014E966 /* libIrrlicht.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C53E24D0A4850120014E966 /* libIrrlicht.a */; };
|
||||||
|
|
@ -78,29 +131,16 @@
|
||||||
4C53E3990A4855BA0014E966 /* DemoApp-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C53E38E0A4855BA0014E966 /* DemoApp-Info.plist */; };
|
4C53E3990A4855BA0014E966 /* DemoApp-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C53E38E0A4855BA0014E966 /* DemoApp-Info.plist */; };
|
||||||
4C53E39A0A4855BA0014E966 /* DemoApp-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C53E38E0A4855BA0014E966 /* DemoApp-Info.plist */; };
|
4C53E39A0A4855BA0014E966 /* DemoApp-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C53E38E0A4855BA0014E966 /* DemoApp-Info.plist */; };
|
||||||
4C53E39B0A4855BA0014E966 /* DemoApp-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C53E38E0A4855BA0014E966 /* DemoApp-Info.plist */; };
|
4C53E39B0A4855BA0014E966 /* DemoApp-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C53E38E0A4855BA0014E966 /* DemoApp-Info.plist */; };
|
||||||
4C53E3B30A4856B30014E966 /* pngrutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1170A484C2A0014E966 /* pngrutil.c */; };
|
|
||||||
4C53E3BB0A4856B30014E966 /* pngget.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E10D0A484C2A0014E966 /* pngget.c */; };
|
|
||||||
4C53E3C40A4856B30014E966 /* pngrtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1160A484C2A0014E966 /* pngrtran.c */; };
|
|
||||||
4C53E3C90A4856B30014E966 /* pngerror.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1090A484C2A0014E966 /* pngerror.c */; };
|
|
||||||
4C53E3CA0A4856B30014E966 /* gzio.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E17D0A484C2C0014E966 /* gzio.c */; };
|
4C53E3CA0A4856B30014E966 /* gzio.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E17D0A484C2C0014E966 /* gzio.c */; };
|
||||||
4C53E3D70A4856B30014E966 /* pngtrans.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E11D0A484C2B0014E966 /* pngtrans.c */; };
|
|
||||||
4C53E3D80A4856B30014E966 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1800A484C2C0014E966 /* inffast.c */; };
|
4C53E3D80A4856B30014E966 /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1800A484C2C0014E966 /* inffast.c */; };
|
||||||
4C53E3DC0A4856B30014E966 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1850A484C2C0014E966 /* inftrees.c */; };
|
4C53E3DC0A4856B30014E966 /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1850A484C2C0014E966 /* inftrees.c */; };
|
||||||
4C53E3E40A4856B30014E966 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E18D0A484C2C0014E966 /* uncompr.c */; };
|
4C53E3E40A4856B30014E966 /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E18D0A484C2C0014E966 /* uncompr.c */; };
|
||||||
4C53E3E90A4856B30014E966 /* pngset.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1180A484C2A0014E966 /* pngset.c */; };
|
|
||||||
4C53E3EE0A4856B30014E966 /* pngrio.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1150A484C2A0014E966 /* pngrio.c */; };
|
|
||||||
4C53E3F30A4856B30014E966 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1750A484C2C0014E966 /* compress.c */; };
|
4C53E3F30A4856B30014E966 /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1750A484C2C0014E966 /* compress.c */; };
|
||||||
4C53E3F60A4856B30014E966 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1770A484C2C0014E966 /* crc32.c */; };
|
4C53E3F60A4856B30014E966 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1770A484C2C0014E966 /* crc32.c */; };
|
||||||
4C53E3FE0A4856B30014E966 /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1920A484C2C0014E966 /* zutil.c */; };
|
4C53E3FE0A4856B30014E966 /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1920A484C2C0014E966 /* zutil.c */; };
|
||||||
4C53E4010A4856B30014E966 /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E18B0A484C2C0014E966 /* trees.c */; };
|
4C53E4010A4856B30014E966 /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E18B0A484C2C0014E966 /* trees.c */; };
|
||||||
4C53E4030A4856B30014E966 /* pngwio.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1210A484C2B0014E966 /* pngwio.c */; };
|
|
||||||
4C53E4040A4856B30014E966 /* pngmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E10E0A484C2A0014E966 /* pngmem.c */; };
|
|
||||||
4C53E40A0A4856B30014E966 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1790A484C2C0014E966 /* deflate.c */; };
|
4C53E40A0A4856B30014E966 /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1790A484C2C0014E966 /* deflate.c */; };
|
||||||
4C53E4110A4856B30014E966 /* pngpread.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1130A484C2A0014E966 /* pngpread.c */; };
|
|
||||||
4C53E4140A4856B30014E966 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1010A484C2A0014E966 /* png.c */; };
|
|
||||||
4C53E4150A4856B30014E966 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1720A484C2C0014E966 /* adler32.c */; };
|
4C53E4150A4856B30014E966 /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1720A484C2C0014E966 /* adler32.c */; };
|
||||||
4C53E4160A4856B30014E966 /* pngwtran.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1230A484C2B0014E966 /* pngwtran.c */; };
|
|
||||||
4C53E41A0A4856B30014E966 /* pngwutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1240A484C2B0014E966 /* pngwutil.c */; };
|
|
||||||
4C53E4280A4856B30014E966 /* CImageLoaderPNG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF600A484C230014E966 /* CImageLoaderPNG.cpp */; };
|
4C53E4280A4856B30014E966 /* CImageLoaderPNG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF600A484C230014E966 /* CImageLoaderPNG.cpp */; };
|
||||||
4C53E4290A4856B30014E966 /* CColorConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DEFC0A484C220014E966 /* CColorConverter.cpp */; };
|
4C53E4290A4856B30014E966 /* CColorConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DEFC0A484C220014E966 /* CColorConverter.cpp */; };
|
||||||
4C53E42A0A4856B30014E966 /* CSceneManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFAB0A484C240014E966 /* CSceneManager.cpp */; };
|
4C53E42A0A4856B30014E966 /* CSceneManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFAB0A484C240014E966 /* CSceneManager.cpp */; };
|
||||||
|
|
@ -136,7 +176,6 @@
|
||||||
4C53E4490A4856B30014E966 /* CTRTextureDetailMap2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFDC0A484C250014E966 /* CTRTextureDetailMap2.cpp */; };
|
4C53E4490A4856B30014E966 /* CTRTextureDetailMap2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFDC0A484C250014E966 /* CTRTextureDetailMap2.cpp */; };
|
||||||
4C53E44A0A4856B30014E966 /* CTRTextureGouraudAddNoZ2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFE40A484C250014E966 /* CTRTextureGouraudAddNoZ2.cpp */; };
|
4C53E44A0A4856B30014E966 /* CTRTextureGouraudAddNoZ2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFE40A484C250014E966 /* CTRTextureGouraudAddNoZ2.cpp */; };
|
||||||
4C53E44C0A4856B30014E966 /* CTRTextureGouraudNoZ.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFE50A484C250014E966 /* CTRTextureGouraudNoZ.cpp */; };
|
4C53E44C0A4856B30014E966 /* CTRTextureGouraudNoZ.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFE50A484C250014E966 /* CTRTextureGouraudNoZ.cpp */; };
|
||||||
4C53E44D0A4856B30014E966 /* CXFileReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFF60A484C250014E966 /* CXFileReader.cpp */; };
|
|
||||||
4C53E44E0A4856B30014E966 /* CGUIScrollBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF4C0A484C230014E966 /* CGUIScrollBar.cpp */; };
|
4C53E44E0A4856B30014E966 /* CGUIScrollBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF4C0A484C230014E966 /* CGUIScrollBar.cpp */; };
|
||||||
4C53E44F0A4856B30014E966 /* CSceneCollisionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFA90A484C240014E966 /* CSceneCollisionManager.cpp */; };
|
4C53E44F0A4856B30014E966 /* CSceneCollisionManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFA90A484C240014E966 /* CSceneCollisionManager.cpp */; };
|
||||||
4C53E4500A4856B30014E966 /* CGUICheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF300A484C230014E966 /* CGUICheckBox.cpp */; };
|
4C53E4500A4856B30014E966 /* CGUICheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF300A484C230014E966 /* CGUICheckBox.cpp */; };
|
||||||
|
|
@ -158,7 +197,6 @@
|
||||||
4C53E4600A4856B30014E966 /* CTRTextureLightMap2_Add.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFE90A484C250014E966 /* CTRTextureLightMap2_Add.cpp */; };
|
4C53E4600A4856B30014E966 /* CTRTextureLightMap2_Add.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFE90A484C250014E966 /* CTRTextureLightMap2_Add.cpp */; };
|
||||||
4C53E4610A4856B30014E966 /* CReadFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFA70A484C240014E966 /* CReadFile.cpp */; };
|
4C53E4610A4856B30014E966 /* CReadFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFA70A484C240014E966 /* CReadFile.cpp */; };
|
||||||
4C53E4620A4856B30014E966 /* COpenGLTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF970A484C240014E966 /* COpenGLTexture.cpp */; };
|
4C53E4620A4856B30014E966 /* COpenGLTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF970A484C240014E966 /* COpenGLTexture.cpp */; };
|
||||||
4C53E4630A4856B30014E966 /* CAnimatedMeshMS3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DEEB0A484C220014E966 /* CAnimatedMeshMS3D.cpp */; };
|
|
||||||
4C53E4640A4856B30014E966 /* COSOperator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF990A484C240014E966 /* COSOperator.cpp */; };
|
4C53E4640A4856B30014E966 /* COSOperator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF990A484C240014E966 /* COSOperator.cpp */; };
|
||||||
4C53E4650A4856B30014E966 /* CMemoryReadFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF740A484C230014E966 /* CMemoryReadFile.cpp */; };
|
4C53E4650A4856B30014E966 /* CMemoryReadFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF740A484C230014E966 /* CMemoryReadFile.cpp */; };
|
||||||
4C53E4660A4856B30014E966 /* CColladaFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DEFA0A484C220014E966 /* CColladaFileLoader.cpp */; };
|
4C53E4660A4856B30014E966 /* CColladaFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DEFA0A484C220014E966 /* CColladaFileLoader.cpp */; };
|
||||||
|
|
@ -168,7 +206,6 @@
|
||||||
4C53E46A0A4856B30014E966 /* CVideoModeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFEE0A484C250014E966 /* CVideoModeList.cpp */; };
|
4C53E46A0A4856B30014E966 /* CVideoModeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFEE0A484C250014E966 /* CVideoModeList.cpp */; };
|
||||||
4C53E46B0A4856B30014E966 /* CXMLReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFFA0A484C250014E966 /* CXMLReader.cpp */; };
|
4C53E46B0A4856B30014E966 /* CXMLReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFFA0A484C250014E966 /* CXMLReader.cpp */; };
|
||||||
4C53E46C0A4856B30014E966 /* COpenGLParallaxMapRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF910A484C240014E966 /* COpenGLParallaxMapRenderer.cpp */; };
|
4C53E46C0A4856B30014E966 /* COpenGLParallaxMapRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF910A484C240014E966 /* COpenGLParallaxMapRenderer.cpp */; };
|
||||||
4C53E46D0A4856B30014E966 /* CDefaultMeshFormatLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF1A0A484C230014E966 /* CDefaultMeshFormatLoader.cpp */; };
|
|
||||||
4C53E46E0A4856B30014E966 /* CTRTextureGouraudNoZ2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFE60A484C250014E966 /* CTRTextureGouraudNoZ2.cpp */; };
|
4C53E46E0A4856B30014E966 /* CTRTextureGouraudNoZ2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFE60A484C250014E966 /* CTRTextureGouraudNoZ2.cpp */; };
|
||||||
4C53E46F0A4856B30014E966 /* CTRTextureGouraudWire.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFE80A484C250014E966 /* CTRTextureGouraudWire.cpp */; };
|
4C53E46F0A4856B30014E966 /* CTRTextureGouraudWire.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFE80A484C250014E966 /* CTRTextureGouraudWire.cpp */; };
|
||||||
4C53E4700A4856B30014E966 /* CParticlePointEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFA10A484C240014E966 /* CParticlePointEmitter.cpp */; };
|
4C53E4700A4856B30014E966 /* CParticlePointEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFA10A484C240014E966 /* CParticlePointEmitter.cpp */; };
|
||||||
|
|
@ -229,7 +266,6 @@
|
||||||
4C53E4A80A4856B30014E966 /* CLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF720A484C230014E966 /* CLogger.cpp */; };
|
4C53E4A80A4856B30014E966 /* CLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF720A484C230014E966 /* CLogger.cpp */; };
|
||||||
4C53E4A90A4856B30014E966 /* CGUIInOutFader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF400A484C230014E966 /* CGUIInOutFader.cpp */; };
|
4C53E4A90A4856B30014E966 /* CGUIInOutFader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DF400A484C230014E966 /* CGUIInOutFader.cpp */; };
|
||||||
4C53E4AA0A4856B30014E966 /* CWriteFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFF20A484C250014E966 /* CWriteFile.cpp */; };
|
4C53E4AA0A4856B30014E966 /* CWriteFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFF20A484C250014E966 /* CWriteFile.cpp */; };
|
||||||
4C53E4AB0A4856B30014E966 /* CXAnimationPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFF40A484C250014E966 /* CXAnimationPlayer.cpp */; };
|
|
||||||
4C53E4AC0A4856B30014E966 /* CCameraMayaSceneNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DEF60A484C220014E966 /* CCameraMayaSceneNode.cpp */; };
|
4C53E4AC0A4856B30014E966 /* CCameraMayaSceneNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DEF60A484C220014E966 /* CCameraMayaSceneNode.cpp */; };
|
||||||
4C53E4AD0A4856B30014E966 /* CTRTextureGouraud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFDF0A484C250014E966 /* CTRTextureGouraud.cpp */; };
|
4C53E4AD0A4856B30014E966 /* CTRTextureGouraud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFDF0A484C250014E966 /* CTRTextureGouraud.cpp */; };
|
||||||
4C53E4AE0A4856B30014E966 /* CTRFlat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFD10A484C240014E966 /* CTRFlat.cpp */; };
|
4C53E4AE0A4856B30014E966 /* CTRFlat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C53DFD10A484C240014E966 /* CTRFlat.cpp */; };
|
||||||
|
|
@ -254,7 +290,6 @@
|
||||||
4C53E57E0A4856B30014E966 /* OSXClipboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1670A484C2C0014E966 /* OSXClipboard.mm */; };
|
4C53E57E0A4856B30014E966 /* OSXClipboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1670A484C2C0014E966 /* OSXClipboard.mm */; };
|
||||||
4C53E57F0A4856B30014E966 /* CIrrDeviceMacOSX.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E15F0A484C2C0014E966 /* CIrrDeviceMacOSX.mm */; };
|
4C53E57F0A4856B30014E966 /* CIrrDeviceMacOSX.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E15F0A484C2C0014E966 /* CIrrDeviceMacOSX.mm */; };
|
||||||
4C53E5800A4856B30014E966 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E14D0A484C2C0014E966 /* AppDelegate.mm */; };
|
4C53E5800A4856B30014E966 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E14D0A484C2C0014E966 /* AppDelegate.mm */; };
|
||||||
4C53E62E0A485ABF0014E966 /* pngread.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E1140A484C2A0014E966 /* pngread.c */; };
|
|
||||||
4C6DC9B70A48715A0017A6E5 /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C6DC9B60A48715A0017A6E5 /* inflate.c */; };
|
4C6DC9B70A48715A0017A6E5 /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C6DC9B60A48715A0017A6E5 /* inflate.c */; };
|
||||||
4CA25BCE0A485EAD00B4E469 /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E6F10A485CD80014E966 /* jcapimin.c */; };
|
4CA25BCE0A485EAD00B4E469 /* jcapimin.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E6F10A485CD80014E966 /* jcapimin.c */; };
|
||||||
4CA25BCF0A485EAD00B4E469 /* jcapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E6F20A485CD80014E966 /* jcapistd.c */; };
|
4CA25BCF0A485EAD00B4E469 /* jcapistd.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C53E6F20A485CD80014E966 /* jcapistd.c */; };
|
||||||
|
|
@ -363,7 +398,6 @@
|
||||||
4CFA7BFA0A88735A00B03626 /* CImageWriterPSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFA7BE80A88735900B03626 /* CImageWriterPSD.cpp */; };
|
4CFA7BFA0A88735A00B03626 /* CImageWriterPSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFA7BE80A88735900B03626 /* CImageWriterPSD.cpp */; };
|
||||||
4CFA7BFC0A88735A00B03626 /* CImageWriterTGA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFA7BEA0A88735900B03626 /* CImageWriterTGA.cpp */; };
|
4CFA7BFC0A88735A00B03626 /* CImageWriterTGA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFA7BEA0A88735900B03626 /* CImageWriterTGA.cpp */; };
|
||||||
4CFA7BFE0A88735A00B03626 /* CSkyDomeSceneNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFA7BEC0A88735A00B03626 /* CSkyDomeSceneNode.cpp */; };
|
4CFA7BFE0A88735A00B03626 /* CSkyDomeSceneNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFA7BEC0A88735A00B03626 /* CSkyDomeSceneNode.cpp */; };
|
||||||
5DD480480C7D8B9100728AA9 /* pngwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DD480470C7D8B9100728AA9 /* pngwrite.c */; };
|
|
||||||
5DD4804E0C7D91DF00728AA9 /* CDepthBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD4804C0C7D91DF00728AA9 /* CDepthBuffer.cpp */; };
|
5DD4804E0C7D91DF00728AA9 /* CDepthBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD4804C0C7D91DF00728AA9 /* CDepthBuffer.cpp */; };
|
||||||
5DD4804F0C7D91DF00728AA9 /* CDepthBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DD4804D0C7D91DF00728AA9 /* CDepthBuffer.h */; };
|
5DD4804F0C7D91DF00728AA9 /* CDepthBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DD4804D0C7D91DF00728AA9 /* CDepthBuffer.h */; };
|
||||||
5DD480520C7D936700728AA9 /* IBurningShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD480500C7D936700728AA9 /* IBurningShader.cpp */; };
|
5DD480520C7D936700728AA9 /* IBurningShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DD480500C7D936700728AA9 /* IBurningShader.cpp */; };
|
||||||
|
|
@ -580,6 +614,60 @@
|
||||||
/* End PBXContainerItemProxy section */
|
/* End PBXContainerItemProxy section */
|
||||||
|
|
||||||
/* Begin PBXFileReference section */
|
/* Begin PBXFileReference section */
|
||||||
|
09198F000D188481001F5EF8 /* png.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = png.c; path = ../libpng_osx/png.c; sourceTree = "<group>"; };
|
||||||
|
09198F010D188481001F5EF8 /* pngerror.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngerror.c; path = ../libpng_osx/pngerror.c; sourceTree = "<group>"; };
|
||||||
|
09198F020D188481001F5EF8 /* pnggccrd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pnggccrd.c; path = ../libpng_osx/pnggccrd.c; sourceTree = "<group>"; };
|
||||||
|
09198F030D188481001F5EF8 /* pngget.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngget.c; path = ../libpng_osx/pngget.c; sourceTree = "<group>"; };
|
||||||
|
09198F040D188481001F5EF8 /* pngmem.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngmem.c; path = ../libpng_osx/pngmem.c; sourceTree = "<group>"; };
|
||||||
|
09198F050D188481001F5EF8 /* pngpread.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngpread.c; path = ../libpng_osx/pngpread.c; sourceTree = "<group>"; };
|
||||||
|
09198F060D188481001F5EF8 /* pngread.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngread.c; path = ../libpng_osx/pngread.c; sourceTree = "<group>"; };
|
||||||
|
09198F070D188481001F5EF8 /* pngrio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngrio.c; path = ../libpng_osx/pngrio.c; sourceTree = "<group>"; };
|
||||||
|
09198F080D188481001F5EF8 /* pngrtran.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngrtran.c; path = ../libpng_osx/pngrtran.c; sourceTree = "<group>"; };
|
||||||
|
09198F090D188481001F5EF8 /* pngrutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngrutil.c; path = ../libpng_osx/pngrutil.c; sourceTree = "<group>"; };
|
||||||
|
09198F0A0D188481001F5EF8 /* pngset.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngset.c; path = ../libpng_osx/pngset.c; sourceTree = "<group>"; };
|
||||||
|
09198F0B0D188481001F5EF8 /* pngtrans.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngtrans.c; path = ../libpng_osx/pngtrans.c; sourceTree = "<group>"; };
|
||||||
|
09198F0C0D188481001F5EF8 /* pngwio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwio.c; path = ../libpng_osx/pngwio.c; sourceTree = "<group>"; };
|
||||||
|
09198F0D0D188481001F5EF8 /* pngwrite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwrite.c; path = ../libpng_osx/pngwrite.c; sourceTree = "<group>"; };
|
||||||
|
09198F0E0D188481001F5EF8 /* pngwtran.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwtran.c; path = ../libpng_osx/pngwtran.c; sourceTree = "<group>"; };
|
||||||
|
09198F0F0D188481001F5EF8 /* pngwutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pngwutil.c; path = ../libpng_osx/pngwutil.c; sourceTree = "<group>"; };
|
||||||
|
0968401E0D0F1A2300333EFD /* CB3DMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CB3DMeshFileLoader.cpp; sourceTree = "<group>"; };
|
||||||
|
0968401F0D0F1A2300333EFD /* CB3DMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CB3DMeshFileLoader.h; sourceTree = "<group>"; };
|
||||||
|
096840200D0F1A2300333EFD /* CBoneSceneNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CBoneSceneNode.cpp; sourceTree = "<group>"; };
|
||||||
|
096840210D0F1A2300333EFD /* CBoneSceneNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CBoneSceneNode.h; sourceTree = "<group>"; };
|
||||||
|
096840220D0F1A2300333EFD /* CBSPMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CBSPMeshFileLoader.cpp; sourceTree = "<group>"; };
|
||||||
|
096840230D0F1A2300333EFD /* CBSPMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CBSPMeshFileLoader.h; sourceTree = "<group>"; };
|
||||||
|
096840250D0F1A2300333EFD /* CColladaMeshWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CColladaMeshWriter.cpp; sourceTree = "<group>"; };
|
||||||
|
096840260D0F1A2300333EFD /* CColladaMeshWriter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CColladaMeshWriter.h; sourceTree = "<group>"; };
|
||||||
|
096840270D0F1A2300333EFD /* CImageLoaderPPM.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CImageLoaderPPM.cpp; sourceTree = "<group>"; };
|
||||||
|
096840280D0F1A2300333EFD /* CImageLoaderPPM.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CImageLoaderPPM.h; sourceTree = "<group>"; };
|
||||||
|
0968402B0D0F1A2300333EFD /* CIrrMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CIrrMeshFileLoader.cpp; sourceTree = "<group>"; };
|
||||||
|
0968402C0D0F1A2300333EFD /* CIrrMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CIrrMeshFileLoader.h; sourceTree = "<group>"; };
|
||||||
|
0968402D0D0F1A2300333EFD /* CIrrMeshWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CIrrMeshWriter.cpp; sourceTree = "<group>"; };
|
||||||
|
0968402E0D0F1A2300333EFD /* CIrrMeshWriter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CIrrMeshWriter.h; sourceTree = "<group>"; };
|
||||||
|
0968402F0D0F1A2300333EFD /* CMD2MeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CMD2MeshFileLoader.cpp; sourceTree = "<group>"; };
|
||||||
|
096840300D0F1A2300333EFD /* CMD2MeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CMD2MeshFileLoader.h; sourceTree = "<group>"; };
|
||||||
|
096840310D0F1A2300333EFD /* CMS3DMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CMS3DMeshFileLoader.cpp; sourceTree = "<group>"; };
|
||||||
|
096840320D0F1A2300333EFD /* CMS3DMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CMS3DMeshFileLoader.h; sourceTree = "<group>"; };
|
||||||
|
096840330D0F1A2300333EFD /* CParticleAnimatedMeshSceneNodeEmitter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CParticleAnimatedMeshSceneNodeEmitter.cpp; sourceTree = "<group>"; };
|
||||||
|
096840340D0F1A2300333EFD /* CParticleAnimatedMeshSceneNodeEmitter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CParticleAnimatedMeshSceneNodeEmitter.h; sourceTree = "<group>"; };
|
||||||
|
096840350D0F1A2300333EFD /* CParticleAttractionAffector.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CParticleAttractionAffector.cpp; sourceTree = "<group>"; };
|
||||||
|
096840360D0F1A2300333EFD /* CParticleAttractionAffector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CParticleAttractionAffector.h; sourceTree = "<group>"; };
|
||||||
|
096840370D0F1A2300333EFD /* CParticleCylinderEmitter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CParticleCylinderEmitter.cpp; sourceTree = "<group>"; };
|
||||||
|
096840380D0F1A2300333EFD /* CParticleCylinderEmitter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CParticleCylinderEmitter.h; sourceTree = "<group>"; };
|
||||||
|
096840390D0F1A2300333EFD /* CParticleMeshEmitter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CParticleMeshEmitter.cpp; sourceTree = "<group>"; };
|
||||||
|
0968403A0D0F1A2300333EFD /* CParticleMeshEmitter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CParticleMeshEmitter.h; sourceTree = "<group>"; };
|
||||||
|
0968403B0D0F1A2300333EFD /* CParticleRingEmitter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CParticleRingEmitter.cpp; sourceTree = "<group>"; };
|
||||||
|
0968403C0D0F1A2300333EFD /* CParticleRingEmitter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CParticleRingEmitter.h; sourceTree = "<group>"; };
|
||||||
|
0968403D0D0F1A2300333EFD /* CParticleRotationAffector.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CParticleRotationAffector.cpp; sourceTree = "<group>"; };
|
||||||
|
0968403E0D0F1A2300333EFD /* CParticleRotationAffector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CParticleRotationAffector.h; sourceTree = "<group>"; };
|
||||||
|
0968403F0D0F1A2300333EFD /* CParticleSphereEmitter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CParticleSphereEmitter.cpp; sourceTree = "<group>"; };
|
||||||
|
096840400D0F1A2300333EFD /* CParticleSphereEmitter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CParticleSphereEmitter.h; sourceTree = "<group>"; };
|
||||||
|
096840410D0F1A2300333EFD /* CSkinnedMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSkinnedMesh.cpp; sourceTree = "<group>"; };
|
||||||
|
096840420D0F1A2300333EFD /* CSkinnedMesh.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSkinnedMesh.h; sourceTree = "<group>"; };
|
||||||
|
096840430D0F1A2300333EFD /* CSTLMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSTLMeshFileLoader.cpp; sourceTree = "<group>"; };
|
||||||
|
096840440D0F1A2300333EFD /* CSTLMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSTLMeshFileLoader.h; sourceTree = "<group>"; };
|
||||||
|
096840450D0F1A2300333EFD /* CSTLMeshWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSTLMeshWriter.cpp; sourceTree = "<group>"; };
|
||||||
|
096840460D0F1A2300333EFD /* CSTLMeshWriter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSTLMeshWriter.h; sourceTree = "<group>"; };
|
||||||
4C0054710A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
|
4C0054710A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
|
||||||
4C0054770A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
|
4C0054770A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
|
||||||
4C00547D0A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
|
4C00547D0A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
|
||||||
|
|
@ -600,8 +688,6 @@
|
||||||
4C0054CA0A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
|
4C0054CA0A48470500C844C2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
|
||||||
4C364EA20A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = COBJMeshFileLoader.cpp; sourceTree = "<group>"; };
|
4C364EA20A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = COBJMeshFileLoader.cpp; sourceTree = "<group>"; };
|
||||||
4C364EA30A6C6DC2004CFBB4 /* COBJMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = COBJMeshFileLoader.h; sourceTree = "<group>"; };
|
4C364EA30A6C6DC2004CFBB4 /* COBJMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = COBJMeshFileLoader.h; sourceTree = "<group>"; };
|
||||||
4C43EEBB0A74A5A300F942FC /* CAnimatedMeshB3d.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; path = CAnimatedMeshB3d.cpp; sourceTree = "<group>"; };
|
|
||||||
4C43EEBD0A74A5AB00F942FC /* CAnimatedMeshB3d.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CAnimatedMeshB3d.h; sourceTree = "<group>"; };
|
|
||||||
4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPakReader.cpp; sourceTree = "<group>"; };
|
4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPakReader.cpp; sourceTree = "<group>"; };
|
||||||
4C43EEBF0A74A5C800F942FC /* CPakReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPakReader.h; sourceTree = "<group>"; };
|
4C43EEBF0A74A5C800F942FC /* CPakReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPakReader.h; sourceTree = "<group>"; };
|
||||||
4C53DEE60A484C220014E966 /* BuiltInFont.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 2; path = BuiltInFont.h; sourceTree = "<group>"; };
|
4C53DEE60A484C220014E966 /* BuiltInFont.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 2; path = BuiltInFont.h; sourceTree = "<group>"; };
|
||||||
|
|
@ -609,8 +695,6 @@
|
||||||
4C53DEE80A484C220014E966 /* C3DSMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = C3DSMeshFileLoader.h; sourceTree = "<group>"; };
|
4C53DEE80A484C220014E966 /* C3DSMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = C3DSMeshFileLoader.h; sourceTree = "<group>"; };
|
||||||
4C53DEE90A484C220014E966 /* CAnimatedMeshMD2.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; path = CAnimatedMeshMD2.cpp; sourceTree = "<group>"; };
|
4C53DEE90A484C220014E966 /* CAnimatedMeshMD2.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 2; path = CAnimatedMeshMD2.cpp; sourceTree = "<group>"; };
|
||||||
4C53DEEA0A484C220014E966 /* CAnimatedMeshMD2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CAnimatedMeshMD2.h; sourceTree = "<group>"; };
|
4C53DEEA0A484C220014E966 /* CAnimatedMeshMD2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CAnimatedMeshMD2.h; sourceTree = "<group>"; };
|
||||||
4C53DEEB0A484C220014E966 /* CAnimatedMeshMS3D.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CAnimatedMeshMS3D.cpp; sourceTree = "<group>"; };
|
|
||||||
4C53DEEC0A484C220014E966 /* CAnimatedMeshMS3D.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CAnimatedMeshMS3D.h; sourceTree = "<group>"; };
|
|
||||||
4C53DEED0A484C220014E966 /* CAnimatedMeshSceneNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CAnimatedMeshSceneNode.cpp; sourceTree = "<group>"; };
|
4C53DEED0A484C220014E966 /* CAnimatedMeshSceneNode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CAnimatedMeshSceneNode.cpp; sourceTree = "<group>"; };
|
||||||
4C53DEEE0A484C220014E966 /* CAnimatedMeshSceneNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CAnimatedMeshSceneNode.h; sourceTree = "<group>"; };
|
4C53DEEE0A484C220014E966 /* CAnimatedMeshSceneNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CAnimatedMeshSceneNode.h; sourceTree = "<group>"; };
|
||||||
4C53DEEF0A484C220014E966 /* CAttributeImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CAttributeImpl.h; sourceTree = "<group>"; };
|
4C53DEEF0A484C220014E966 /* CAttributeImpl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CAttributeImpl.h; sourceTree = "<group>"; };
|
||||||
|
|
@ -656,8 +740,6 @@
|
||||||
4C53DF170A484C230014E966 /* CD3D9ShaderMaterialRenderer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CD3D9ShaderMaterialRenderer.h; sourceTree = "<group>"; };
|
4C53DF170A484C230014E966 /* CD3D9ShaderMaterialRenderer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CD3D9ShaderMaterialRenderer.h; sourceTree = "<group>"; };
|
||||||
4C53DF180A484C230014E966 /* CD3D9Texture.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CD3D9Texture.cpp; sourceTree = "<group>"; };
|
4C53DF180A484C230014E966 /* CD3D9Texture.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CD3D9Texture.cpp; sourceTree = "<group>"; };
|
||||||
4C53DF190A484C230014E966 /* CD3D9Texture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CD3D9Texture.h; sourceTree = "<group>"; };
|
4C53DF190A484C230014E966 /* CD3D9Texture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CD3D9Texture.h; sourceTree = "<group>"; };
|
||||||
4C53DF1A0A484C230014E966 /* CDefaultMeshFormatLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CDefaultMeshFormatLoader.cpp; sourceTree = "<group>"; };
|
|
||||||
4C53DF1B0A484C230014E966 /* CDefaultMeshFormatLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CDefaultMeshFormatLoader.h; sourceTree = "<group>"; };
|
|
||||||
4C53DF1C0A484C230014E966 /* CDefaultSceneNodeAnimatorFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CDefaultSceneNodeAnimatorFactory.cpp; sourceTree = "<group>"; };
|
4C53DF1C0A484C230014E966 /* CDefaultSceneNodeAnimatorFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CDefaultSceneNodeAnimatorFactory.cpp; sourceTree = "<group>"; };
|
||||||
4C53DF1D0A484C230014E966 /* CDefaultSceneNodeAnimatorFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CDefaultSceneNodeAnimatorFactory.h; sourceTree = "<group>"; };
|
4C53DF1D0A484C230014E966 /* CDefaultSceneNodeAnimatorFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CDefaultSceneNodeAnimatorFactory.h; sourceTree = "<group>"; };
|
||||||
4C53DF1E0A484C230014E966 /* CDefaultSceneNodeFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CDefaultSceneNodeFactory.cpp; sourceTree = "<group>"; };
|
4C53DF1E0A484C230014E966 /* CDefaultSceneNodeFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CDefaultSceneNodeFactory.cpp; sourceTree = "<group>"; };
|
||||||
|
|
@ -870,10 +952,6 @@
|
||||||
4C53DFF10A484C250014E966 /* CWaterSurfaceSceneNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CWaterSurfaceSceneNode.h; sourceTree = "<group>"; };
|
4C53DFF10A484C250014E966 /* CWaterSurfaceSceneNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CWaterSurfaceSceneNode.h; sourceTree = "<group>"; };
|
||||||
4C53DFF20A484C250014E966 /* CWriteFile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CWriteFile.cpp; sourceTree = "<group>"; };
|
4C53DFF20A484C250014E966 /* CWriteFile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CWriteFile.cpp; sourceTree = "<group>"; };
|
||||||
4C53DFF30A484C250014E966 /* CWriteFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CWriteFile.h; sourceTree = "<group>"; };
|
4C53DFF30A484C250014E966 /* CWriteFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CWriteFile.h; sourceTree = "<group>"; };
|
||||||
4C53DFF40A484C250014E966 /* CXAnimationPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CXAnimationPlayer.cpp; sourceTree = "<group>"; };
|
|
||||||
4C53DFF50A484C250014E966 /* CXAnimationPlayer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CXAnimationPlayer.h; sourceTree = "<group>"; };
|
|
||||||
4C53DFF60A484C250014E966 /* CXFileReader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CXFileReader.cpp; sourceTree = "<group>"; };
|
|
||||||
4C53DFF70A484C250014E966 /* CXFileReader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CXFileReader.h; sourceTree = "<group>"; };
|
|
||||||
4C53DFF80A484C250014E966 /* CXMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CXMeshFileLoader.cpp; sourceTree = "<group>"; };
|
4C53DFF80A484C250014E966 /* CXMeshFileLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CXMeshFileLoader.cpp; sourceTree = "<group>"; };
|
||||||
4C53DFF90A484C250014E966 /* CXMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CXMeshFileLoader.h; sourceTree = "<group>"; };
|
4C53DFF90A484C250014E966 /* CXMeshFileLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CXMeshFileLoader.h; sourceTree = "<group>"; };
|
||||||
4C53DFFA0A484C250014E966 /* CXMLReader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CXMLReader.cpp; sourceTree = "<group>"; };
|
4C53DFFA0A484C250014E966 /* CXMLReader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CXMLReader.cpp; sourceTree = "<group>"; };
|
||||||
|
|
@ -892,20 +970,6 @@
|
||||||
4C53E00E0A484C250014E966 /* irrXML.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = irrXML.cpp; sourceTree = "<group>"; };
|
4C53E00E0A484C250014E966 /* irrXML.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = irrXML.cpp; sourceTree = "<group>"; };
|
||||||
4C53E00F0A484C250014E966 /* ITriangleRenderer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ITriangleRenderer.h; sourceTree = "<group>"; };
|
4C53E00F0A484C250014E966 /* ITriangleRenderer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ITriangleRenderer.h; sourceTree = "<group>"; };
|
||||||
4C53E0110A484C250014E966 /* IZBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IZBuffer.h; sourceTree = "<group>"; };
|
4C53E0110A484C250014E966 /* IZBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = IZBuffer.h; sourceTree = "<group>"; };
|
||||||
4C53E1010A484C2A0014E966 /* png.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = png.c; sourceTree = "<group>"; };
|
|
||||||
4C53E1090A484C2A0014E966 /* pngerror.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngerror.c; sourceTree = "<group>"; };
|
|
||||||
4C53E10D0A484C2A0014E966 /* pngget.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngget.c; sourceTree = "<group>"; };
|
|
||||||
4C53E10E0A484C2A0014E966 /* pngmem.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngmem.c; sourceTree = "<group>"; };
|
|
||||||
4C53E1130A484C2A0014E966 /* pngpread.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngpread.c; sourceTree = "<group>"; };
|
|
||||||
4C53E1140A484C2A0014E966 /* pngread.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngread.c; sourceTree = "<group>"; };
|
|
||||||
4C53E1150A484C2A0014E966 /* pngrio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngrio.c; sourceTree = "<group>"; };
|
|
||||||
4C53E1160A484C2A0014E966 /* pngrtran.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngrtran.c; sourceTree = "<group>"; };
|
|
||||||
4C53E1170A484C2A0014E966 /* pngrutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngrutil.c; sourceTree = "<group>"; };
|
|
||||||
4C53E1180A484C2A0014E966 /* pngset.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngset.c; sourceTree = "<group>"; };
|
|
||||||
4C53E11D0A484C2B0014E966 /* pngtrans.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngtrans.c; sourceTree = "<group>"; };
|
|
||||||
4C53E1210A484C2B0014E966 /* pngwio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngwio.c; sourceTree = "<group>"; };
|
|
||||||
4C53E1230A484C2B0014E966 /* pngwtran.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngwtran.c; sourceTree = "<group>"; };
|
|
||||||
4C53E1240A484C2B0014E966 /* pngwutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngwutil.c; sourceTree = "<group>"; };
|
|
||||||
4C53E14C0A484C2C0014E966 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
|
4C53E14C0A484C2C0014E966 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
|
||||||
4C53E14D0A484C2C0014E966 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; };
|
4C53E14D0A484C2C0014E966 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; };
|
||||||
4C53E15E0A484C2C0014E966 /* CIrrDeviceMacOSX.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CIrrDeviceMacOSX.h; sourceTree = "<group>"; };
|
4C53E15E0A484C2C0014E966 /* CIrrDeviceMacOSX.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CIrrDeviceMacOSX.h; sourceTree = "<group>"; };
|
||||||
|
|
@ -932,7 +996,7 @@
|
||||||
4C53E18D0A484C2C0014E966 /* uncompr.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = "<group>"; };
|
4C53E18D0A484C2C0014E966 /* uncompr.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = "<group>"; };
|
||||||
4C53E1920A484C2C0014E966 /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = "<group>"; };
|
4C53E1920A484C2C0014E966 /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = "<group>"; };
|
||||||
4C53E24D0A4850120014E966 /* libIrrlicht.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIrrlicht.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
4C53E24D0A4850120014E966 /* libIrrlicht.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIrrlicht.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
4C53E2520A4850550014E966 /* Quake3Map.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Quake3Map.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
4C53E2520A4850550014E966 /* Quake3Map.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Quake3Map.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||||
4C53E26D0A4850D60014E966 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
|
4C53E26D0A4850D60014E966 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
|
||||||
4C53E26E0A4850D60014E966 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
|
4C53E26E0A4850D60014E966 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
|
||||||
4C53E38E0A4855BA0014E966 /* DemoApp-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "DemoApp-Info.plist"; sourceTree = "<group>"; };
|
4C53E38E0A4855BA0014E966 /* DemoApp-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "DemoApp-Info.plist"; sourceTree = "<group>"; };
|
||||||
|
|
@ -1147,7 +1211,6 @@
|
||||||
4CFA7C7E0A88742900B03626 /* triangle3d.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = triangle3d.h; sourceTree = "<group>"; };
|
4CFA7C7E0A88742900B03626 /* triangle3d.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = triangle3d.h; sourceTree = "<group>"; };
|
||||||
4CFA7C7F0A88742900B03626 /* vector2d.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vector2d.h; sourceTree = "<group>"; };
|
4CFA7C7F0A88742900B03626 /* vector2d.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vector2d.h; sourceTree = "<group>"; };
|
||||||
4CFA7C800A88742900B03626 /* vector3d.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vector3d.h; sourceTree = "<group>"; };
|
4CFA7C800A88742900B03626 /* vector3d.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vector3d.h; sourceTree = "<group>"; };
|
||||||
5DD480470C7D8B9100728AA9 /* pngwrite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pngwrite.c; sourceTree = "<group>"; };
|
|
||||||
5DD4804C0C7D91DF00728AA9 /* CDepthBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDepthBuffer.cpp; sourceTree = "<group>"; };
|
5DD4804C0C7D91DF00728AA9 /* CDepthBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDepthBuffer.cpp; sourceTree = "<group>"; };
|
||||||
5DD4804D0C7D91DF00728AA9 /* CDepthBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDepthBuffer.h; sourceTree = "<group>"; };
|
5DD4804D0C7D91DF00728AA9 /* CDepthBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDepthBuffer.h; sourceTree = "<group>"; };
|
||||||
5DD480500C7D936700728AA9 /* IBurningShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IBurningShader.cpp; sourceTree = "<group>"; };
|
5DD480500C7D936700728AA9 /* IBurningShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IBurningShader.cpp; sourceTree = "<group>"; };
|
||||||
|
|
@ -1475,7 +1538,7 @@
|
||||||
4C6DC9960A486B110017A6E5 /* Engine */,
|
4C6DC9960A486B110017A6E5 /* Engine */,
|
||||||
4C53E14A0A484C2C0014E966 /* MacOSX */,
|
4C53E14A0A484C2C0014E966 /* MacOSX */,
|
||||||
4C53E0130A484C250014E966 /* jpeglib */,
|
4C53E0130A484C250014E966 /* jpeglib */,
|
||||||
4C53E0A80A484C280014E966 /* libpng */,
|
4C53E0A80A484C280014E966 /* libpng_osx */,
|
||||||
4C53E1710A484C2C0014E966 /* zlib */,
|
4C53E1710A484C2C0014E966 /* zlib */,
|
||||||
);
|
);
|
||||||
name = Irrlicht;
|
name = Irrlicht;
|
||||||
|
|
@ -1548,25 +1611,27 @@
|
||||||
path = jpeglib;
|
path = jpeglib;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
4C53E0A80A484C280014E966 /* libpng */ = {
|
4C53E0A80A484C280014E966 /* libpng_osx */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
5DD480470C7D8B9100728AA9 /* pngwrite.c */,
|
09198F000D188481001F5EF8 /* png.c */,
|
||||||
4C53E1010A484C2A0014E966 /* png.c */,
|
09198F010D188481001F5EF8 /* pngerror.c */,
|
||||||
4C53E1090A484C2A0014E966 /* pngerror.c */,
|
09198F020D188481001F5EF8 /* pnggccrd.c */,
|
||||||
4C53E10D0A484C2A0014E966 /* pngget.c */,
|
09198F030D188481001F5EF8 /* pngget.c */,
|
||||||
4C53E10E0A484C2A0014E966 /* pngmem.c */,
|
09198F040D188481001F5EF8 /* pngmem.c */,
|
||||||
4C53E1130A484C2A0014E966 /* pngpread.c */,
|
09198F050D188481001F5EF8 /* pngpread.c */,
|
||||||
4C53E1140A484C2A0014E966 /* pngread.c */,
|
09198F060D188481001F5EF8 /* pngread.c */,
|
||||||
4C53E1150A484C2A0014E966 /* pngrio.c */,
|
09198F070D188481001F5EF8 /* pngrio.c */,
|
||||||
4C53E1160A484C2A0014E966 /* pngrtran.c */,
|
09198F080D188481001F5EF8 /* pngrtran.c */,
|
||||||
4C53E1170A484C2A0014E966 /* pngrutil.c */,
|
09198F090D188481001F5EF8 /* pngrutil.c */,
|
||||||
4C53E1180A484C2A0014E966 /* pngset.c */,
|
09198F0A0D188481001F5EF8 /* pngset.c */,
|
||||||
4C53E11D0A484C2B0014E966 /* pngtrans.c */,
|
09198F0B0D188481001F5EF8 /* pngtrans.c */,
|
||||||
4C53E1210A484C2B0014E966 /* pngwio.c */,
|
09198F0C0D188481001F5EF8 /* pngwio.c */,
|
||||||
4C53E1230A484C2B0014E966 /* pngwtran.c */,
|
09198F0D0D188481001F5EF8 /* pngwrite.c */,
|
||||||
4C53E1240A484C2B0014E966 /* pngwutil.c */,
|
09198F0E0D188481001F5EF8 /* pngwtran.c */,
|
||||||
|
09198F0F0D188481001F5EF8 /* pngwutil.c */,
|
||||||
);
|
);
|
||||||
|
name = libpng_osx;
|
||||||
path = libpng;
|
path = libpng;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
|
|
@ -1669,6 +1734,44 @@
|
||||||
4C6DC9960A486B110017A6E5 /* Engine */ = {
|
4C6DC9960A486B110017A6E5 /* Engine */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
0968401E0D0F1A2300333EFD /* CB3DMeshFileLoader.cpp */,
|
||||||
|
0968401F0D0F1A2300333EFD /* CB3DMeshFileLoader.h */,
|
||||||
|
096840200D0F1A2300333EFD /* CBoneSceneNode.cpp */,
|
||||||
|
096840210D0F1A2300333EFD /* CBoneSceneNode.h */,
|
||||||
|
096840220D0F1A2300333EFD /* CBSPMeshFileLoader.cpp */,
|
||||||
|
096840230D0F1A2300333EFD /* CBSPMeshFileLoader.h */,
|
||||||
|
096840250D0F1A2300333EFD /* CColladaMeshWriter.cpp */,
|
||||||
|
096840260D0F1A2300333EFD /* CColladaMeshWriter.h */,
|
||||||
|
096840270D0F1A2300333EFD /* CImageLoaderPPM.cpp */,
|
||||||
|
096840280D0F1A2300333EFD /* CImageLoaderPPM.h */,
|
||||||
|
0968402B0D0F1A2300333EFD /* CIrrMeshFileLoader.cpp */,
|
||||||
|
0968402C0D0F1A2300333EFD /* CIrrMeshFileLoader.h */,
|
||||||
|
0968402D0D0F1A2300333EFD /* CIrrMeshWriter.cpp */,
|
||||||
|
0968402E0D0F1A2300333EFD /* CIrrMeshWriter.h */,
|
||||||
|
0968402F0D0F1A2300333EFD /* CMD2MeshFileLoader.cpp */,
|
||||||
|
096840300D0F1A2300333EFD /* CMD2MeshFileLoader.h */,
|
||||||
|
096840310D0F1A2300333EFD /* CMS3DMeshFileLoader.cpp */,
|
||||||
|
096840320D0F1A2300333EFD /* CMS3DMeshFileLoader.h */,
|
||||||
|
096840330D0F1A2300333EFD /* CParticleAnimatedMeshSceneNodeEmitter.cpp */,
|
||||||
|
096840340D0F1A2300333EFD /* CParticleAnimatedMeshSceneNodeEmitter.h */,
|
||||||
|
096840350D0F1A2300333EFD /* CParticleAttractionAffector.cpp */,
|
||||||
|
096840360D0F1A2300333EFD /* CParticleAttractionAffector.h */,
|
||||||
|
096840370D0F1A2300333EFD /* CParticleCylinderEmitter.cpp */,
|
||||||
|
096840380D0F1A2300333EFD /* CParticleCylinderEmitter.h */,
|
||||||
|
096840390D0F1A2300333EFD /* CParticleMeshEmitter.cpp */,
|
||||||
|
0968403A0D0F1A2300333EFD /* CParticleMeshEmitter.h */,
|
||||||
|
0968403B0D0F1A2300333EFD /* CParticleRingEmitter.cpp */,
|
||||||
|
0968403C0D0F1A2300333EFD /* CParticleRingEmitter.h */,
|
||||||
|
0968403D0D0F1A2300333EFD /* CParticleRotationAffector.cpp */,
|
||||||
|
0968403E0D0F1A2300333EFD /* CParticleRotationAffector.h */,
|
||||||
|
0968403F0D0F1A2300333EFD /* CParticleSphereEmitter.cpp */,
|
||||||
|
096840400D0F1A2300333EFD /* CParticleSphereEmitter.h */,
|
||||||
|
096840410D0F1A2300333EFD /* CSkinnedMesh.cpp */,
|
||||||
|
096840420D0F1A2300333EFD /* CSkinnedMesh.h */,
|
||||||
|
096840430D0F1A2300333EFD /* CSTLMeshFileLoader.cpp */,
|
||||||
|
096840440D0F1A2300333EFD /* CSTLMeshFileLoader.h */,
|
||||||
|
096840450D0F1A2300333EFD /* CSTLMeshWriter.cpp */,
|
||||||
|
096840460D0F1A2300333EFD /* CSTLMeshWriter.h */,
|
||||||
5DD480C10C7DA66800728AA9 /* COpenGLExtensionHandler.h */,
|
5DD480C10C7DA66800728AA9 /* COpenGLExtensionHandler.h */,
|
||||||
5DD480C20C7DA66800728AA9 /* CMD3MeshFileLoader.h */,
|
5DD480C20C7DA66800728AA9 /* CMD3MeshFileLoader.h */,
|
||||||
5DD480C30C7DA66800728AA9 /* CIrrDeviceSDL.h */,
|
5DD480C30C7DA66800728AA9 /* CIrrDeviceSDL.h */,
|
||||||
|
|
@ -1699,8 +1802,6 @@
|
||||||
4CFA7BED0A88735A00B03626 /* CSkyDomeSceneNode.h */,
|
4CFA7BED0A88735A00B03626 /* CSkyDomeSceneNode.h */,
|
||||||
4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */,
|
4C43EEBE0A74A5C800F942FC /* CPakReader.cpp */,
|
||||||
4C43EEBF0A74A5C800F942FC /* CPakReader.h */,
|
4C43EEBF0A74A5C800F942FC /* CPakReader.h */,
|
||||||
4C43EEBD0A74A5AB00F942FC /* CAnimatedMeshB3d.h */,
|
|
||||||
4C43EEBB0A74A5A300F942FC /* CAnimatedMeshB3d.cpp */,
|
|
||||||
4C364EA20A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp */,
|
4C364EA20A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp */,
|
||||||
4C364EA30A6C6DC2004CFBB4 /* COBJMeshFileLoader.h */,
|
4C364EA30A6C6DC2004CFBB4 /* COBJMeshFileLoader.h */,
|
||||||
4CC36B0D0A6B61DB0076C4B2 /* CSphereSceneNode.cpp */,
|
4CC36B0D0A6B61DB0076C4B2 /* CSphereSceneNode.cpp */,
|
||||||
|
|
@ -1710,8 +1811,6 @@
|
||||||
4C53DEE80A484C220014E966 /* C3DSMeshFileLoader.h */,
|
4C53DEE80A484C220014E966 /* C3DSMeshFileLoader.h */,
|
||||||
4C53DEE90A484C220014E966 /* CAnimatedMeshMD2.cpp */,
|
4C53DEE90A484C220014E966 /* CAnimatedMeshMD2.cpp */,
|
||||||
4C53DEEA0A484C220014E966 /* CAnimatedMeshMD2.h */,
|
4C53DEEA0A484C220014E966 /* CAnimatedMeshMD2.h */,
|
||||||
4C53DEEB0A484C220014E966 /* CAnimatedMeshMS3D.cpp */,
|
|
||||||
4C53DEEC0A484C220014E966 /* CAnimatedMeshMS3D.h */,
|
|
||||||
4C53DEED0A484C220014E966 /* CAnimatedMeshSceneNode.cpp */,
|
4C53DEED0A484C220014E966 /* CAnimatedMeshSceneNode.cpp */,
|
||||||
4C53DEEE0A484C220014E966 /* CAnimatedMeshSceneNode.h */,
|
4C53DEEE0A484C220014E966 /* CAnimatedMeshSceneNode.h */,
|
||||||
4C53DEEF0A484C220014E966 /* CAttributeImpl.h */,
|
4C53DEEF0A484C220014E966 /* CAttributeImpl.h */,
|
||||||
|
|
@ -1757,8 +1856,6 @@
|
||||||
4C53DF170A484C230014E966 /* CD3D9ShaderMaterialRenderer.h */,
|
4C53DF170A484C230014E966 /* CD3D9ShaderMaterialRenderer.h */,
|
||||||
4C53DF180A484C230014E966 /* CD3D9Texture.cpp */,
|
4C53DF180A484C230014E966 /* CD3D9Texture.cpp */,
|
||||||
4C53DF190A484C230014E966 /* CD3D9Texture.h */,
|
4C53DF190A484C230014E966 /* CD3D9Texture.h */,
|
||||||
4C53DF1A0A484C230014E966 /* CDefaultMeshFormatLoader.cpp */,
|
|
||||||
4C53DF1B0A484C230014E966 /* CDefaultMeshFormatLoader.h */,
|
|
||||||
4C53DF1C0A484C230014E966 /* CDefaultSceneNodeAnimatorFactory.cpp */,
|
4C53DF1C0A484C230014E966 /* CDefaultSceneNodeAnimatorFactory.cpp */,
|
||||||
4C53DF1D0A484C230014E966 /* CDefaultSceneNodeAnimatorFactory.h */,
|
4C53DF1D0A484C230014E966 /* CDefaultSceneNodeAnimatorFactory.h */,
|
||||||
4C53DF1E0A484C230014E966 /* CDefaultSceneNodeFactory.cpp */,
|
4C53DF1E0A484C230014E966 /* CDefaultSceneNodeFactory.cpp */,
|
||||||
|
|
@ -1971,10 +2068,6 @@
|
||||||
4C53DFF10A484C250014E966 /* CWaterSurfaceSceneNode.h */,
|
4C53DFF10A484C250014E966 /* CWaterSurfaceSceneNode.h */,
|
||||||
4C53DFF20A484C250014E966 /* CWriteFile.cpp */,
|
4C53DFF20A484C250014E966 /* CWriteFile.cpp */,
|
||||||
4C53DFF30A484C250014E966 /* CWriteFile.h */,
|
4C53DFF30A484C250014E966 /* CWriteFile.h */,
|
||||||
4C53DFF40A484C250014E966 /* CXAnimationPlayer.cpp */,
|
|
||||||
4C53DFF50A484C250014E966 /* CXAnimationPlayer.h */,
|
|
||||||
4C53DFF60A484C250014E966 /* CXFileReader.cpp */,
|
|
||||||
4C53DFF70A484C250014E966 /* CXFileReader.h */,
|
|
||||||
4C53DFF80A484C250014E966 /* CXMeshFileLoader.cpp */,
|
4C53DFF80A484C250014E966 /* CXMeshFileLoader.cpp */,
|
||||||
4C53DFF90A484C250014E966 /* CXMeshFileLoader.h */,
|
4C53DFF90A484C250014E966 /* CXMeshFileLoader.h */,
|
||||||
4C53DFFA0A484C250014E966 /* CXMLReader.cpp */,
|
4C53DFFA0A484C250014E966 /* CXMLReader.cpp */,
|
||||||
|
|
@ -2169,6 +2262,25 @@
|
||||||
5DD480C70C7DA66800728AA9 /* COpenGLExtensionHandler.h in Headers */,
|
5DD480C70C7DA66800728AA9 /* COpenGLExtensionHandler.h in Headers */,
|
||||||
5DD480C80C7DA66800728AA9 /* CMD3MeshFileLoader.h in Headers */,
|
5DD480C80C7DA66800728AA9 /* CMD3MeshFileLoader.h in Headers */,
|
||||||
5DD480C90C7DA66800728AA9 /* CIrrDeviceSDL.h in Headers */,
|
5DD480C90C7DA66800728AA9 /* CIrrDeviceSDL.h in Headers */,
|
||||||
|
096840480D0F1A2300333EFD /* CB3DMeshFileLoader.h in Headers */,
|
||||||
|
0968404A0D0F1A2300333EFD /* CBoneSceneNode.h in Headers */,
|
||||||
|
0968404C0D0F1A2300333EFD /* CBSPMeshFileLoader.h in Headers */,
|
||||||
|
0968404F0D0F1A2300333EFD /* CColladaMeshWriter.h in Headers */,
|
||||||
|
096840510D0F1A2300333EFD /* CImageLoaderPPM.h in Headers */,
|
||||||
|
096840550D0F1A2300333EFD /* CIrrMeshFileLoader.h in Headers */,
|
||||||
|
096840570D0F1A2300333EFD /* CIrrMeshWriter.h in Headers */,
|
||||||
|
096840590D0F1A2300333EFD /* CMD2MeshFileLoader.h in Headers */,
|
||||||
|
0968405B0D0F1A2300333EFD /* CMS3DMeshFileLoader.h in Headers */,
|
||||||
|
0968405D0D0F1A2300333EFD /* CParticleAnimatedMeshSceneNodeEmitter.h in Headers */,
|
||||||
|
0968405F0D0F1A2300333EFD /* CParticleAttractionAffector.h in Headers */,
|
||||||
|
096840610D0F1A2300333EFD /* CParticleCylinderEmitter.h in Headers */,
|
||||||
|
096840630D0F1A2300333EFD /* CParticleMeshEmitter.h in Headers */,
|
||||||
|
096840650D0F1A2300333EFD /* CParticleRingEmitter.h in Headers */,
|
||||||
|
096840670D0F1A2300333EFD /* CParticleRotationAffector.h in Headers */,
|
||||||
|
096840690D0F1A2300333EFD /* CParticleSphereEmitter.h in Headers */,
|
||||||
|
0968406B0D0F1A2300333EFD /* CSkinnedMesh.h in Headers */,
|
||||||
|
0968406D0D0F1A2300333EFD /* CSTLMeshFileLoader.h in Headers */,
|
||||||
|
0968406F0D0F1A2300333EFD /* CSTLMeshWriter.h in Headers */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
|
|
@ -2746,29 +2858,16 @@
|
||||||
4CA25C1A0A485EAD00B4E469 /* wrppm.c in Sources */,
|
4CA25C1A0A485EAD00B4E469 /* wrppm.c in Sources */,
|
||||||
4CA25C1B0A485EAD00B4E469 /* wrrle.c in Sources */,
|
4CA25C1B0A485EAD00B4E469 /* wrrle.c in Sources */,
|
||||||
4CA25C1C0A485EAD00B4E469 /* wrtarga.c in Sources */,
|
4CA25C1C0A485EAD00B4E469 /* wrtarga.c in Sources */,
|
||||||
4C53E3B30A4856B30014E966 /* pngrutil.c in Sources */,
|
|
||||||
4C53E3BB0A4856B30014E966 /* pngget.c in Sources */,
|
|
||||||
4C53E3C40A4856B30014E966 /* pngrtran.c in Sources */,
|
|
||||||
4C53E3C90A4856B30014E966 /* pngerror.c in Sources */,
|
|
||||||
4C53E3CA0A4856B30014E966 /* gzio.c in Sources */,
|
4C53E3CA0A4856B30014E966 /* gzio.c in Sources */,
|
||||||
4C53E3D70A4856B30014E966 /* pngtrans.c in Sources */,
|
|
||||||
4C53E3D80A4856B30014E966 /* inffast.c in Sources */,
|
4C53E3D80A4856B30014E966 /* inffast.c in Sources */,
|
||||||
4C53E3DC0A4856B30014E966 /* inftrees.c in Sources */,
|
4C53E3DC0A4856B30014E966 /* inftrees.c in Sources */,
|
||||||
4C53E3E40A4856B30014E966 /* uncompr.c in Sources */,
|
4C53E3E40A4856B30014E966 /* uncompr.c in Sources */,
|
||||||
4C53E3E90A4856B30014E966 /* pngset.c in Sources */,
|
|
||||||
4C53E3EE0A4856B30014E966 /* pngrio.c in Sources */,
|
|
||||||
4C53E3F30A4856B30014E966 /* compress.c in Sources */,
|
4C53E3F30A4856B30014E966 /* compress.c in Sources */,
|
||||||
4C53E3F60A4856B30014E966 /* crc32.c in Sources */,
|
4C53E3F60A4856B30014E966 /* crc32.c in Sources */,
|
||||||
4C53E3FE0A4856B30014E966 /* zutil.c in Sources */,
|
4C53E3FE0A4856B30014E966 /* zutil.c in Sources */,
|
||||||
4C53E4010A4856B30014E966 /* trees.c in Sources */,
|
4C53E4010A4856B30014E966 /* trees.c in Sources */,
|
||||||
4C53E4030A4856B30014E966 /* pngwio.c in Sources */,
|
|
||||||
4C53E4040A4856B30014E966 /* pngmem.c in Sources */,
|
|
||||||
4C53E40A0A4856B30014E966 /* deflate.c in Sources */,
|
4C53E40A0A4856B30014E966 /* deflate.c in Sources */,
|
||||||
4C53E4110A4856B30014E966 /* pngpread.c in Sources */,
|
|
||||||
4C53E4140A4856B30014E966 /* png.c in Sources */,
|
|
||||||
4C53E4150A4856B30014E966 /* adler32.c in Sources */,
|
4C53E4150A4856B30014E966 /* adler32.c in Sources */,
|
||||||
4C53E4160A4856B30014E966 /* pngwtran.c in Sources */,
|
|
||||||
4C53E41A0A4856B30014E966 /* pngwutil.c in Sources */,
|
|
||||||
4C53E4280A4856B30014E966 /* CImageLoaderPNG.cpp in Sources */,
|
4C53E4280A4856B30014E966 /* CImageLoaderPNG.cpp in Sources */,
|
||||||
4C53E4290A4856B30014E966 /* CColorConverter.cpp in Sources */,
|
4C53E4290A4856B30014E966 /* CColorConverter.cpp in Sources */,
|
||||||
4C53E42A0A4856B30014E966 /* CSceneManager.cpp in Sources */,
|
4C53E42A0A4856B30014E966 /* CSceneManager.cpp in Sources */,
|
||||||
|
|
@ -2804,7 +2903,6 @@
|
||||||
4C53E4490A4856B30014E966 /* CTRTextureDetailMap2.cpp in Sources */,
|
4C53E4490A4856B30014E966 /* CTRTextureDetailMap2.cpp in Sources */,
|
||||||
4C53E44A0A4856B30014E966 /* CTRTextureGouraudAddNoZ2.cpp in Sources */,
|
4C53E44A0A4856B30014E966 /* CTRTextureGouraudAddNoZ2.cpp in Sources */,
|
||||||
4C53E44C0A4856B30014E966 /* CTRTextureGouraudNoZ.cpp in Sources */,
|
4C53E44C0A4856B30014E966 /* CTRTextureGouraudNoZ.cpp in Sources */,
|
||||||
4C53E44D0A4856B30014E966 /* CXFileReader.cpp in Sources */,
|
|
||||||
4C53E44E0A4856B30014E966 /* CGUIScrollBar.cpp in Sources */,
|
4C53E44E0A4856B30014E966 /* CGUIScrollBar.cpp in Sources */,
|
||||||
4C53E44F0A4856B30014E966 /* CSceneCollisionManager.cpp in Sources */,
|
4C53E44F0A4856B30014E966 /* CSceneCollisionManager.cpp in Sources */,
|
||||||
4C53E4500A4856B30014E966 /* CGUICheckBox.cpp in Sources */,
|
4C53E4500A4856B30014E966 /* CGUICheckBox.cpp in Sources */,
|
||||||
|
|
@ -2826,7 +2924,6 @@
|
||||||
4C53E4600A4856B30014E966 /* CTRTextureLightMap2_Add.cpp in Sources */,
|
4C53E4600A4856B30014E966 /* CTRTextureLightMap2_Add.cpp in Sources */,
|
||||||
4C53E4610A4856B30014E966 /* CReadFile.cpp in Sources */,
|
4C53E4610A4856B30014E966 /* CReadFile.cpp in Sources */,
|
||||||
4C53E4620A4856B30014E966 /* COpenGLTexture.cpp in Sources */,
|
4C53E4620A4856B30014E966 /* COpenGLTexture.cpp in Sources */,
|
||||||
4C53E4630A4856B30014E966 /* CAnimatedMeshMS3D.cpp in Sources */,
|
|
||||||
4C53E4640A4856B30014E966 /* COSOperator.cpp in Sources */,
|
4C53E4640A4856B30014E966 /* COSOperator.cpp in Sources */,
|
||||||
4C53E4650A4856B30014E966 /* CMemoryReadFile.cpp in Sources */,
|
4C53E4650A4856B30014E966 /* CMemoryReadFile.cpp in Sources */,
|
||||||
4C53E4660A4856B30014E966 /* CColladaFileLoader.cpp in Sources */,
|
4C53E4660A4856B30014E966 /* CColladaFileLoader.cpp in Sources */,
|
||||||
|
|
@ -2836,7 +2933,6 @@
|
||||||
4C53E46A0A4856B30014E966 /* CVideoModeList.cpp in Sources */,
|
4C53E46A0A4856B30014E966 /* CVideoModeList.cpp in Sources */,
|
||||||
4C53E46B0A4856B30014E966 /* CXMLReader.cpp in Sources */,
|
4C53E46B0A4856B30014E966 /* CXMLReader.cpp in Sources */,
|
||||||
4C53E46C0A4856B30014E966 /* COpenGLParallaxMapRenderer.cpp in Sources */,
|
4C53E46C0A4856B30014E966 /* COpenGLParallaxMapRenderer.cpp in Sources */,
|
||||||
4C53E46D0A4856B30014E966 /* CDefaultMeshFormatLoader.cpp in Sources */,
|
|
||||||
4C53E46E0A4856B30014E966 /* CTRTextureGouraudNoZ2.cpp in Sources */,
|
4C53E46E0A4856B30014E966 /* CTRTextureGouraudNoZ2.cpp in Sources */,
|
||||||
4C53E46F0A4856B30014E966 /* CTRTextureGouraudWire.cpp in Sources */,
|
4C53E46F0A4856B30014E966 /* CTRTextureGouraudWire.cpp in Sources */,
|
||||||
4C53E4700A4856B30014E966 /* CParticlePointEmitter.cpp in Sources */,
|
4C53E4700A4856B30014E966 /* CParticlePointEmitter.cpp in Sources */,
|
||||||
|
|
@ -2897,7 +2993,6 @@
|
||||||
4C53E4A80A4856B30014E966 /* CLogger.cpp in Sources */,
|
4C53E4A80A4856B30014E966 /* CLogger.cpp in Sources */,
|
||||||
4C53E4A90A4856B30014E966 /* CGUIInOutFader.cpp in Sources */,
|
4C53E4A90A4856B30014E966 /* CGUIInOutFader.cpp in Sources */,
|
||||||
4C53E4AA0A4856B30014E966 /* CWriteFile.cpp in Sources */,
|
4C53E4AA0A4856B30014E966 /* CWriteFile.cpp in Sources */,
|
||||||
4C53E4AB0A4856B30014E966 /* CXAnimationPlayer.cpp in Sources */,
|
|
||||||
4C53E4AC0A4856B30014E966 /* CCameraMayaSceneNode.cpp in Sources */,
|
4C53E4AC0A4856B30014E966 /* CCameraMayaSceneNode.cpp in Sources */,
|
||||||
4C53E4AD0A4856B30014E966 /* CTRTextureGouraud.cpp in Sources */,
|
4C53E4AD0A4856B30014E966 /* CTRTextureGouraud.cpp in Sources */,
|
||||||
4C53E4AE0A4856B30014E966 /* CTRFlat.cpp in Sources */,
|
4C53E4AE0A4856B30014E966 /* CTRFlat.cpp in Sources */,
|
||||||
|
|
@ -2922,11 +3017,9 @@
|
||||||
4C53E57E0A4856B30014E966 /* OSXClipboard.mm in Sources */,
|
4C53E57E0A4856B30014E966 /* OSXClipboard.mm in Sources */,
|
||||||
4C53E57F0A4856B30014E966 /* CIrrDeviceMacOSX.mm in Sources */,
|
4C53E57F0A4856B30014E966 /* CIrrDeviceMacOSX.mm in Sources */,
|
||||||
4C53E5800A4856B30014E966 /* AppDelegate.mm in Sources */,
|
4C53E5800A4856B30014E966 /* AppDelegate.mm in Sources */,
|
||||||
4C53E62E0A485ABF0014E966 /* pngread.c in Sources */,
|
|
||||||
4C6DC9B70A48715A0017A6E5 /* inflate.c in Sources */,
|
4C6DC9B70A48715A0017A6E5 /* inflate.c in Sources */,
|
||||||
4CC36B0F0A6B61DB0076C4B2 /* CSphereSceneNode.cpp in Sources */,
|
4CC36B0F0A6B61DB0076C4B2 /* CSphereSceneNode.cpp in Sources */,
|
||||||
4C364EA40A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp in Sources */,
|
4C364EA40A6C6DC2004CFBB4 /* COBJMeshFileLoader.cpp in Sources */,
|
||||||
4C43EEBC0A74A5A300F942FC /* CAnimatedMeshB3d.cpp in Sources */,
|
|
||||||
4C43EEC00A74A5C800F942FC /* CPakReader.cpp in Sources */,
|
4C43EEC00A74A5C800F942FC /* CPakReader.cpp in Sources */,
|
||||||
4CFA7BEE0A88735A00B03626 /* CImageLoaderBMP.cpp in Sources */,
|
4CFA7BEE0A88735A00B03626 /* CImageLoaderBMP.cpp in Sources */,
|
||||||
4CFA7BF00A88735A00B03626 /* CImageWriterBMP.cpp in Sources */,
|
4CFA7BF00A88735A00B03626 /* CImageWriterBMP.cpp in Sources */,
|
||||||
|
|
@ -2937,7 +3030,6 @@
|
||||||
4CFA7BFA0A88735A00B03626 /* CImageWriterPSD.cpp in Sources */,
|
4CFA7BFA0A88735A00B03626 /* CImageWriterPSD.cpp in Sources */,
|
||||||
4CFA7BFC0A88735A00B03626 /* CImageWriterTGA.cpp in Sources */,
|
4CFA7BFC0A88735A00B03626 /* CImageWriterTGA.cpp in Sources */,
|
||||||
4CFA7BFE0A88735A00B03626 /* CSkyDomeSceneNode.cpp in Sources */,
|
4CFA7BFE0A88735A00B03626 /* CSkyDomeSceneNode.cpp in Sources */,
|
||||||
5DD480480C7D8B9100728AA9 /* pngwrite.c in Sources */,
|
|
||||||
5DD4804E0C7D91DF00728AA9 /* CDepthBuffer.cpp in Sources */,
|
5DD4804E0C7D91DF00728AA9 /* CDepthBuffer.cpp in Sources */,
|
||||||
5DD480520C7D936700728AA9 /* IBurningShader.cpp in Sources */,
|
5DD480520C7D936700728AA9 /* IBurningShader.cpp in Sources */,
|
||||||
5DD4805A0C7D945800728AA9 /* CAnimatedMeshMD3.cpp in Sources */,
|
5DD4805A0C7D945800728AA9 /* CAnimatedMeshMD3.cpp in Sources */,
|
||||||
|
|
@ -2953,6 +3045,41 @@
|
||||||
5DD480CA0C7DA66800728AA9 /* CIrrDeviceSDL.cpp in Sources */,
|
5DD480CA0C7DA66800728AA9 /* CIrrDeviceSDL.cpp in Sources */,
|
||||||
5DD480CB0C7DA66800728AA9 /* COpenGLExtensionHandler.cpp in Sources */,
|
5DD480CB0C7DA66800728AA9 /* COpenGLExtensionHandler.cpp in Sources */,
|
||||||
5DD480CC0C7DA66800728AA9 /* CMD3MeshFileLoader.cpp in Sources */,
|
5DD480CC0C7DA66800728AA9 /* CMD3MeshFileLoader.cpp in Sources */,
|
||||||
|
096840470D0F1A2300333EFD /* CB3DMeshFileLoader.cpp in Sources */,
|
||||||
|
096840490D0F1A2300333EFD /* CBoneSceneNode.cpp in Sources */,
|
||||||
|
0968404B0D0F1A2300333EFD /* CBSPMeshFileLoader.cpp in Sources */,
|
||||||
|
0968404E0D0F1A2300333EFD /* CColladaMeshWriter.cpp in Sources */,
|
||||||
|
096840500D0F1A2300333EFD /* CImageLoaderPPM.cpp in Sources */,
|
||||||
|
096840540D0F1A2300333EFD /* CIrrMeshFileLoader.cpp in Sources */,
|
||||||
|
096840560D0F1A2300333EFD /* CIrrMeshWriter.cpp in Sources */,
|
||||||
|
096840580D0F1A2300333EFD /* CMD2MeshFileLoader.cpp in Sources */,
|
||||||
|
0968405A0D0F1A2300333EFD /* CMS3DMeshFileLoader.cpp in Sources */,
|
||||||
|
0968405C0D0F1A2300333EFD /* CParticleAnimatedMeshSceneNodeEmitter.cpp in Sources */,
|
||||||
|
0968405E0D0F1A2300333EFD /* CParticleAttractionAffector.cpp in Sources */,
|
||||||
|
096840600D0F1A2300333EFD /* CParticleCylinderEmitter.cpp in Sources */,
|
||||||
|
096840620D0F1A2300333EFD /* CParticleMeshEmitter.cpp in Sources */,
|
||||||
|
096840640D0F1A2300333EFD /* CParticleRingEmitter.cpp in Sources */,
|
||||||
|
096840660D0F1A2300333EFD /* CParticleRotationAffector.cpp in Sources */,
|
||||||
|
096840680D0F1A2300333EFD /* CParticleSphereEmitter.cpp in Sources */,
|
||||||
|
0968406A0D0F1A2300333EFD /* CSkinnedMesh.cpp in Sources */,
|
||||||
|
0968406C0D0F1A2300333EFD /* CSTLMeshFileLoader.cpp in Sources */,
|
||||||
|
0968406E0D0F1A2300333EFD /* CSTLMeshWriter.cpp in Sources */,
|
||||||
|
09198F100D188481001F5EF8 /* png.c in Sources */,
|
||||||
|
09198F110D188481001F5EF8 /* pngerror.c in Sources */,
|
||||||
|
09198F120D188481001F5EF8 /* pnggccrd.c in Sources */,
|
||||||
|
09198F130D188481001F5EF8 /* pngget.c in Sources */,
|
||||||
|
09198F140D188481001F5EF8 /* pngmem.c in Sources */,
|
||||||
|
09198F150D188481001F5EF8 /* pngpread.c in Sources */,
|
||||||
|
09198F160D188481001F5EF8 /* pngread.c in Sources */,
|
||||||
|
09198F170D188481001F5EF8 /* pngrio.c in Sources */,
|
||||||
|
09198F180D188481001F5EF8 /* pngrtran.c in Sources */,
|
||||||
|
09198F190D188481001F5EF8 /* pngrutil.c in Sources */,
|
||||||
|
09198F1A0D188481001F5EF8 /* pngset.c in Sources */,
|
||||||
|
09198F1B0D188481001F5EF8 /* pngtrans.c in Sources */,
|
||||||
|
09198F1C0D188481001F5EF8 /* pngwio.c in Sources */,
|
||||||
|
09198F1D0D188481001F5EF8 /* pngwrite.c in Sources */,
|
||||||
|
09198F1E0D188481001F5EF8 /* pngwtran.c in Sources */,
|
||||||
|
09198F1F0D188481001F5EF8 /* pngwutil.c in Sources */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
|
|
@ -3174,6 +3301,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3182,7 +3311,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3190,7 +3319,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = 2DGraphics;
|
PRODUCT_NAME = 2DGraphics_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3231,6 +3360,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3239,7 +3370,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3247,7 +3378,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = Collision;
|
PRODUCT_NAME = Collision_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3288,6 +3419,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3296,7 +3429,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3304,7 +3437,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = PerPixelLighting;
|
PRODUCT_NAME = PerPixelLighting_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3346,6 +3479,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3354,7 +3489,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3362,7 +3497,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = TerrainRendering;
|
PRODUCT_NAME = TerrainRendering_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3403,6 +3538,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3411,7 +3548,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3419,7 +3556,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = SpecialFx;
|
PRODUCT_NAME = SpecialFx_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3460,6 +3597,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3468,7 +3607,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3476,7 +3615,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = UserInterface;
|
PRODUCT_NAME = UserInterface_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3517,6 +3656,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3525,7 +3666,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3533,7 +3674,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = CustomSceneNode;
|
PRODUCT_NAME = CustomSceneNode_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3574,6 +3715,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3582,7 +3725,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
LIBRARY_SEARCH_PATHS = (
|
LIBRARY_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
|
"$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
|
||||||
|
|
@ -3595,7 +3738,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = Quake3Map;
|
PRODUCT_NAME = Quake3Map_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3641,6 +3784,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3649,7 +3794,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3657,7 +3802,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = Shaders;
|
PRODUCT_NAME = Shaders_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3702,6 +3847,8 @@
|
||||||
i386,
|
i386,
|
||||||
);
|
);
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3710,7 +3857,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3718,7 +3865,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = Movement;
|
PRODUCT_NAME = Movement_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3763,6 +3910,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3771,7 +3920,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3779,7 +3928,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = MeshViewer;
|
PRODUCT_NAME = MeshViewer_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3820,6 +3969,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3828,7 +3979,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3836,7 +3987,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = RenderToTexture;
|
PRODUCT_NAME = RenderToTexture_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
@ -3899,6 +4050,8 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
|
DEPLOYMENT_LOCATION = YES;
|
||||||
|
DSTROOT = ../../../bin/MacOSX;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
|
@ -3907,7 +4060,7 @@
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
GCC_PRECOMPILE_PREFIX_HEADER = NO;
|
||||||
GCC_PREFIX_HEADER = "";
|
GCC_PREFIX_HEADER = "";
|
||||||
INFOPLIST_FILE = "DemoApp-Info.plist";
|
INFOPLIST_FILE = "DemoApp-Info.plist";
|
||||||
INSTALL_PATH = "$(HOME)/Applications";
|
INSTALL_PATH = /;
|
||||||
OTHER_LDFLAGS = (
|
OTHER_LDFLAGS = (
|
||||||
"-framework",
|
"-framework",
|
||||||
Foundation,
|
Foundation,
|
||||||
|
|
@ -3915,7 +4068,7 @@
|
||||||
AppKit,
|
AppKit,
|
||||||
);
|
);
|
||||||
PREBINDING = NO;
|
PREBINDING = NO;
|
||||||
PRODUCT_NAME = Demo;
|
PRODUCT_NAME = Demo_dbg;
|
||||||
WRAPPER_EXTENSION = app;
|
WRAPPER_EXTENSION = app;
|
||||||
ZERO_LINK = YES;
|
ZERO_LINK = YES;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,814 @@
|
||||||
|
|
||||||
|
#if 0 /* in case someone actually tries to compile this */
|
||||||
|
|
||||||
|
/* example.c - an example of using libpng
|
||||||
|
* Last changed in libpng 1.2.1 December 7, 2001.
|
||||||
|
* This file has been placed in the public domain by the authors.
|
||||||
|
* Maintained 1998-2007 Glenn Randers-Pehrson
|
||||||
|
* Maintained 1996, 1997 Andreas Dilger)
|
||||||
|
* Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* This is an example of how to use libpng to read and write PNG files.
|
||||||
|
* The file libpng.txt is much more verbose then this. If you have not
|
||||||
|
* read it, do so first. This was designed to be a starting point of an
|
||||||
|
* implementation. This is not officially part of libpng, is hereby placed
|
||||||
|
* in the public domain, and therefore does not require a copyright notice.
|
||||||
|
*
|
||||||
|
* This file does not currently compile, because it is missing certain
|
||||||
|
* parts, like allocating memory to hold an image. You will have to
|
||||||
|
* supply these parts to get it to compile. For an example of a minimal
|
||||||
|
* working PNG reader/writer, see pngtest.c, included in this distribution;
|
||||||
|
* see also the programs in the contrib directory.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "png.h"
|
||||||
|
|
||||||
|
/* The png_jmpbuf() macro, used in error handling, became available in
|
||||||
|
* libpng version 1.0.6. If you want to be able to run your code with older
|
||||||
|
* versions of libpng, you must define the macro yourself (but only if it
|
||||||
|
* is not already defined by libpng!).
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef png_jmpbuf
|
||||||
|
# define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Check to see if a file is a PNG file using png_sig_cmp(). png_sig_cmp()
|
||||||
|
* returns zero if the image is a PNG and nonzero if it isn't a PNG.
|
||||||
|
*
|
||||||
|
* The function check_if_png() shown here, but not used, returns nonzero (true)
|
||||||
|
* if the file can be opened and is a PNG, 0 (false) otherwise.
|
||||||
|
*
|
||||||
|
* If this call is successful, and you are going to keep the file open,
|
||||||
|
* you should call png_set_sig_bytes(png_ptr, PNG_BYTES_TO_CHECK); once
|
||||||
|
* you have created the png_ptr, so that libpng knows your application
|
||||||
|
* has read that many bytes from the start of the file. Make sure you
|
||||||
|
* don't call png_set_sig_bytes() with more than 8 bytes read or give it
|
||||||
|
* an incorrect number of bytes read, or you will either have read too
|
||||||
|
* many bytes (your fault), or you are telling libpng to read the wrong
|
||||||
|
* number of magic bytes (also your fault).
|
||||||
|
*
|
||||||
|
* Many applications already read the first 2 or 4 bytes from the start
|
||||||
|
* of the image to determine the file type, so it would be easiest just
|
||||||
|
* to pass the bytes to png_sig_cmp() or even skip that if you know
|
||||||
|
* you have a PNG file, and call png_set_sig_bytes().
|
||||||
|
*/
|
||||||
|
#define PNG_BYTES_TO_CHECK 4
|
||||||
|
int check_if_png(char *file_name, FILE **fp)
|
||||||
|
{
|
||||||
|
char buf[PNG_BYTES_TO_CHECK];
|
||||||
|
|
||||||
|
/* Open the prospective PNG file. */
|
||||||
|
if ((*fp = fopen(file_name, "rb")) == NULL)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* Read in some of the signature bytes */
|
||||||
|
if (fread(buf, 1, PNG_BYTES_TO_CHECK, *fp) != PNG_BYTES_TO_CHECK)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* Compare the first PNG_BYTES_TO_CHECK bytes of the signature.
|
||||||
|
Return nonzero (true) if they match */
|
||||||
|
|
||||||
|
return(!png_sig_cmp(buf, (png_size_t)0, PNG_BYTES_TO_CHECK));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Read a PNG file. You may want to return an error code if the read
|
||||||
|
* fails (depending upon the failure). There are two "prototypes" given
|
||||||
|
* here - one where we are given the filename, and we need to open the
|
||||||
|
* file, and the other where we are given an open file (possibly with
|
||||||
|
* some or all of the magic bytes read - see comments above).
|
||||||
|
*/
|
||||||
|
#ifdef open_file /* prototype 1 */
|
||||||
|
void read_png(char *file_name) /* We need to open the file */
|
||||||
|
{
|
||||||
|
png_structp png_ptr;
|
||||||
|
png_infop info_ptr;
|
||||||
|
unsigned int sig_read = 0;
|
||||||
|
png_uint_32 width, height;
|
||||||
|
int bit_depth, color_type, interlace_type;
|
||||||
|
FILE *fp;
|
||||||
|
|
||||||
|
if ((fp = fopen(file_name, "rb")) == NULL)
|
||||||
|
return (ERROR);
|
||||||
|
#else no_open_file /* prototype 2 */
|
||||||
|
void read_png(FILE *fp, unsigned int sig_read) /* file is already open */
|
||||||
|
{
|
||||||
|
png_structp png_ptr;
|
||||||
|
png_infop info_ptr;
|
||||||
|
png_uint_32 width, height;
|
||||||
|
int bit_depth, color_type, interlace_type;
|
||||||
|
#endif no_open_file /* only use one prototype! */
|
||||||
|
|
||||||
|
/* Create and initialize the png_struct with the desired error handler
|
||||||
|
* functions. If you want to use the default stderr and longjump method,
|
||||||
|
* you can supply NULL for the last three parameters. We also supply the
|
||||||
|
* the compiler header file version, so that we know if the application
|
||||||
|
* was compiled with a compatible version of the library. REQUIRED
|
||||||
|
*/
|
||||||
|
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
|
||||||
|
png_voidp user_error_ptr, user_error_fn, user_warning_fn);
|
||||||
|
|
||||||
|
if (png_ptr == NULL)
|
||||||
|
{
|
||||||
|
fclose(fp);
|
||||||
|
return (ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Allocate/initialize the memory for image information. REQUIRED. */
|
||||||
|
info_ptr = png_create_info_struct(png_ptr);
|
||||||
|
if (info_ptr == NULL)
|
||||||
|
{
|
||||||
|
fclose(fp);
|
||||||
|
png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
|
||||||
|
return (ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Set error handling if you are using the setjmp/longjmp method (this is
|
||||||
|
* the normal method of doing things with libpng). REQUIRED unless you
|
||||||
|
* set up your own error handlers in the png_create_read_struct() earlier.
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (setjmp(png_jmpbuf(png_ptr)))
|
||||||
|
{
|
||||||
|
/* Free all of the memory associated with the png_ptr and info_ptr */
|
||||||
|
png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
|
||||||
|
fclose(fp);
|
||||||
|
/* If we get here, we had a problem reading the file */
|
||||||
|
return (ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* One of the following I/O initialization methods is REQUIRED */
|
||||||
|
#ifdef streams /* PNG file I/O method 1 */
|
||||||
|
/* Set up the input control if you are using standard C streams */
|
||||||
|
png_init_io(png_ptr, fp);
|
||||||
|
|
||||||
|
#else no_streams /* PNG file I/O method 2 */
|
||||||
|
/* If you are using replacement read functions, instead of calling
|
||||||
|
* png_init_io() here you would call:
|
||||||
|
*/
|
||||||
|
png_set_read_fn(png_ptr, (void *)user_io_ptr, user_read_fn);
|
||||||
|
/* where user_io_ptr is a structure you want available to the callbacks */
|
||||||
|
#endif no_streams /* Use only one I/O method! */
|
||||||
|
|
||||||
|
/* If we have already read some of the signature */
|
||||||
|
png_set_sig_bytes(png_ptr, sig_read);
|
||||||
|
|
||||||
|
#ifdef hilevel
|
||||||
|
/*
|
||||||
|
* If you have enough memory to read in the entire image at once,
|
||||||
|
* and you need to specify only transforms that can be controlled
|
||||||
|
* with one of the PNG_TRANSFORM_* bits (this presently excludes
|
||||||
|
* dithering, filling, setting background, and doing gamma
|
||||||
|
* adjustment), then you can read the entire image (including
|
||||||
|
* pixels) into the info structure with this call:
|
||||||
|
*/
|
||||||
|
png_read_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
|
||||||
|
#else
|
||||||
|
/* OK, you're doing it the hard way, with the lower-level functions */
|
||||||
|
|
||||||
|
/* The call to png_read_info() gives us all of the information from the
|
||||||
|
* PNG file before the first IDAT (image data chunk). REQUIRED
|
||||||
|
*/
|
||||||
|
png_read_info(png_ptr, info_ptr);
|
||||||
|
|
||||||
|
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
|
||||||
|
&interlace_type, int_p_NULL, int_p_NULL);
|
||||||
|
|
||||||
|
/* Set up the data transformations you want. Note that these are all
|
||||||
|
* optional. Only call them if you want/need them. Many of the
|
||||||
|
* transformations only work on specific types of images, and many
|
||||||
|
* are mutually exclusive.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* tell libpng to strip 16 bit/color files down to 8 bits/color */
|
||||||
|
png_set_strip_16(png_ptr);
|
||||||
|
|
||||||
|
/* Strip alpha bytes from the input data without combining with the
|
||||||
|
* background (not recommended).
|
||||||
|
*/
|
||||||
|
png_set_strip_alpha(png_ptr);
|
||||||
|
|
||||||
|
/* Extract multiple pixels with bit depths of 1, 2, and 4 from a single
|
||||||
|
* byte into separate bytes (useful for paletted and grayscale images).
|
||||||
|
*/
|
||||||
|
png_set_packing(png_ptr);
|
||||||
|
|
||||||
|
/* Change the order of packed pixels to least significant bit first
|
||||||
|
* (not useful if you are using png_set_packing). */
|
||||||
|
png_set_packswap(png_ptr);
|
||||||
|
|
||||||
|
/* Expand paletted colors into true RGB triplets */
|
||||||
|
if (color_type == PNG_COLOR_TYPE_PALETTE)
|
||||||
|
png_set_palette_to_rgb(png_ptr);
|
||||||
|
|
||||||
|
/* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
|
||||||
|
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
|
||||||
|
png_set_gray_1_2_4_to_8(png_ptr);
|
||||||
|
|
||||||
|
/* Expand paletted or RGB images with transparency to full alpha channels
|
||||||
|
* so the data will be available as RGBA quartets.
|
||||||
|
*/
|
||||||
|
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
|
||||||
|
png_set_tRNS_to_alpha(png_ptr);
|
||||||
|
|
||||||
|
/* Set the background color to draw transparent and alpha images over.
|
||||||
|
* It is possible to set the red, green, and blue components directly
|
||||||
|
* for paletted images instead of supplying a palette index. Note that
|
||||||
|
* even if the PNG file supplies a background, you are not required to
|
||||||
|
* use it - you should use the (solid) application background if it has one.
|
||||||
|
*/
|
||||||
|
|
||||||
|
png_color_16 my_background, *image_background;
|
||||||
|
|
||||||
|
if (png_get_bKGD(png_ptr, info_ptr, &image_background))
|
||||||
|
png_set_background(png_ptr, image_background,
|
||||||
|
PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
|
||||||
|
else
|
||||||
|
png_set_background(png_ptr, &my_background,
|
||||||
|
PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
|
||||||
|
|
||||||
|
/* Some suggestions as to how to get a screen gamma value */
|
||||||
|
|
||||||
|
/* Note that screen gamma is the display_exponent, which includes
|
||||||
|
* the CRT_exponent and any correction for viewing conditions */
|
||||||
|
if (/* We have a user-defined screen gamma value */)
|
||||||
|
{
|
||||||
|
screen_gamma = user-defined screen_gamma;
|
||||||
|
}
|
||||||
|
/* This is one way that applications share the same screen gamma value */
|
||||||
|
else if ((gamma_str = getenv("SCREEN_GAMMA")) != NULL)
|
||||||
|
{
|
||||||
|
screen_gamma = atof(gamma_str);
|
||||||
|
}
|
||||||
|
/* If we don't have another value */
|
||||||
|
else
|
||||||
|
{
|
||||||
|
screen_gamma = 2.2; /* A good guess for a PC monitors in a dimly
|
||||||
|
lit room */
|
||||||
|
screen_gamma = 1.7 or 1.0; /* A good guess for Mac systems */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Tell libpng to handle the gamma conversion for you. The final call
|
||||||
|
* is a good guess for PC generated images, but it should be configurable
|
||||||
|
* by the user at run time by the user. It is strongly suggested that
|
||||||
|
* your application support gamma correction.
|
||||||
|
*/
|
||||||
|
|
||||||
|
int intent;
|
||||||
|
|
||||||
|
if (png_get_sRGB(png_ptr, info_ptr, &intent))
|
||||||
|
png_set_gamma(png_ptr, screen_gamma, 0.45455);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
double image_gamma;
|
||||||
|
if (png_get_gAMA(png_ptr, info_ptr, &image_gamma))
|
||||||
|
png_set_gamma(png_ptr, screen_gamma, image_gamma);
|
||||||
|
else
|
||||||
|
png_set_gamma(png_ptr, screen_gamma, 0.45455);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Dither RGB files down to 8 bit palette or reduce palettes
|
||||||
|
* to the number of colors available on your screen.
|
||||||
|
*/
|
||||||
|
if (color_type & PNG_COLOR_MASK_COLOR)
|
||||||
|
{
|
||||||
|
int num_palette;
|
||||||
|
png_colorp palette;
|
||||||
|
|
||||||
|
/* This reduces the image to the application supplied palette */
|
||||||
|
if (/* we have our own palette */)
|
||||||
|
{
|
||||||
|
/* An array of colors to which the image should be dithered */
|
||||||
|
png_color std_color_cube[MAX_SCREEN_COLORS];
|
||||||
|
|
||||||
|
png_set_dither(png_ptr, std_color_cube, MAX_SCREEN_COLORS,
|
||||||
|
MAX_SCREEN_COLORS, png_uint_16p_NULL, 0);
|
||||||
|
}
|
||||||
|
/* This reduces the image to the palette supplied in the file */
|
||||||
|
else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette))
|
||||||
|
{
|
||||||
|
png_uint_16p histogram = NULL;
|
||||||
|
|
||||||
|
png_get_hIST(png_ptr, info_ptr, &histogram);
|
||||||
|
|
||||||
|
png_set_dither(png_ptr, palette, num_palette,
|
||||||
|
max_screen_colors, histogram, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* invert monochrome files to have 0 as white and 1 as black */
|
||||||
|
png_set_invert_mono(png_ptr);
|
||||||
|
|
||||||
|
/* If you want to shift the pixel values from the range [0,255] or
|
||||||
|
* [0,65535] to the original [0,7] or [0,31], or whatever range the
|
||||||
|
* colors were originally in:
|
||||||
|
*/
|
||||||
|
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
|
||||||
|
{
|
||||||
|
png_color_8p sig_bit;
|
||||||
|
|
||||||
|
png_get_sBIT(png_ptr, info_ptr, &sig_bit);
|
||||||
|
png_set_shift(png_ptr, sig_bit);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* flip the RGB pixels to BGR (or RGBA to BGRA) */
|
||||||
|
if (color_type & PNG_COLOR_MASK_COLOR)
|
||||||
|
png_set_bgr(png_ptr);
|
||||||
|
|
||||||
|
/* swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
|
||||||
|
png_set_swap_alpha(png_ptr);
|
||||||
|
|
||||||
|
/* swap bytes of 16 bit files to least significant byte first */
|
||||||
|
png_set_swap(png_ptr);
|
||||||
|
|
||||||
|
/* Add filler (or alpha) byte (before/after each RGB triplet) */
|
||||||
|
png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
|
||||||
|
|
||||||
|
/* Turn on interlace handling. REQUIRED if you are not using
|
||||||
|
* png_read_image(). To see how to handle interlacing passes,
|
||||||
|
* see the png_read_row() method below:
|
||||||
|
*/
|
||||||
|
number_passes = png_set_interlace_handling(png_ptr);
|
||||||
|
|
||||||
|
/* Optional call to gamma correct and add the background to the palette
|
||||||
|
* and update info structure. REQUIRED if you are expecting libpng to
|
||||||
|
* update the palette for you (ie you selected such a transform above).
|
||||||
|
*/
|
||||||
|
png_read_update_info(png_ptr, info_ptr);
|
||||||
|
|
||||||
|
/* Allocate the memory to hold the image using the fields of info_ptr. */
|
||||||
|
|
||||||
|
/* The easiest way to read the image: */
|
||||||
|
png_bytep row_pointers[height];
|
||||||
|
|
||||||
|
for (row = 0; row < height; row++)
|
||||||
|
{
|
||||||
|
row_pointers[row] = png_malloc(png_ptr, png_get_rowbytes(png_ptr,
|
||||||
|
info_ptr));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Now it's time to read the image. One of these methods is REQUIRED */
|
||||||
|
#ifdef entire /* Read the entire image in one go */
|
||||||
|
png_read_image(png_ptr, row_pointers);
|
||||||
|
|
||||||
|
#else no_entire /* Read the image one or more scanlines at a time */
|
||||||
|
/* The other way to read images - deal with interlacing: */
|
||||||
|
|
||||||
|
for (pass = 0; pass < number_passes; pass++)
|
||||||
|
{
|
||||||
|
#ifdef single /* Read the image a single row at a time */
|
||||||
|
for (y = 0; y < height; y++)
|
||||||
|
{
|
||||||
|
png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#else no_single /* Read the image several rows at a time */
|
||||||
|
for (y = 0; y < height; y += number_of_rows)
|
||||||
|
{
|
||||||
|
#ifdef sparkle /* Read the image using the "sparkle" effect. */
|
||||||
|
png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL,
|
||||||
|
number_of_rows);
|
||||||
|
#else no_sparkle /* Read the image using the "rectangle" effect */
|
||||||
|
png_read_rows(png_ptr, png_bytepp_NULL, &row_pointers[y],
|
||||||
|
number_of_rows);
|
||||||
|
#endif no_sparkle /* use only one of these two methods */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* if you want to display the image after every pass, do
|
||||||
|
so here */
|
||||||
|
#endif no_single /* use only one of these two methods */
|
||||||
|
}
|
||||||
|
#endif no_entire /* use only one of these two methods */
|
||||||
|
|
||||||
|
/* read rest of file, and get additional chunks in info_ptr - REQUIRED */
|
||||||
|
png_read_end(png_ptr, info_ptr);
|
||||||
|
#endif hilevel
|
||||||
|
|
||||||
|
/* At this point you have read the entire image */
|
||||||
|
|
||||||
|
/* clean up after the read, and free any memory allocated - REQUIRED */
|
||||||
|
png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
|
||||||
|
|
||||||
|
/* close the file */
|
||||||
|
fclose(fp);
|
||||||
|
|
||||||
|
/* that's it */
|
||||||
|
return (OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* progressively read a file */
|
||||||
|
|
||||||
|
int
|
||||||
|
initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr)
|
||||||
|
{
|
||||||
|
/* Create and initialize the png_struct with the desired error handler
|
||||||
|
* functions. If you want to use the default stderr and longjump method,
|
||||||
|
* you can supply NULL for the last three parameters. We also check that
|
||||||
|
* the library version is compatible in case we are using dynamically
|
||||||
|
* linked libraries.
|
||||||
|
*/
|
||||||
|
*png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
|
||||||
|
png_voidp user_error_ptr, user_error_fn, user_warning_fn);
|
||||||
|
|
||||||
|
if (*png_ptr == NULL)
|
||||||
|
{
|
||||||
|
*info_ptr = NULL;
|
||||||
|
return (ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
*info_ptr = png_create_info_struct(png_ptr);
|
||||||
|
|
||||||
|
if (*info_ptr == NULL)
|
||||||
|
{
|
||||||
|
png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
|
||||||
|
return (ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (setjmp(png_jmpbuf((*png_ptr))))
|
||||||
|
{
|
||||||
|
png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
|
||||||
|
return (ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This one's new. You will need to provide all three
|
||||||
|
* function callbacks, even if you aren't using them all.
|
||||||
|
* If you aren't using all functions, you can specify NULL
|
||||||
|
* parameters. Even when all three functions are NULL,
|
||||||
|
* you need to call png_set_progressive_read_fn().
|
||||||
|
* These functions shouldn't be dependent on global or
|
||||||
|
* static variables if you are decoding several images
|
||||||
|
* simultaneously. You should store stream specific data
|
||||||
|
* in a separate struct, given as the second parameter,
|
||||||
|
* and retrieve the pointer from inside the callbacks using
|
||||||
|
* the function png_get_progressive_ptr(png_ptr).
|
||||||
|
*/
|
||||||
|
png_set_progressive_read_fn(*png_ptr, (void *)stream_data,
|
||||||
|
info_callback, row_callback, end_callback);
|
||||||
|
|
||||||
|
return (OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
process_data(png_structp *png_ptr, png_infop *info_ptr,
|
||||||
|
png_bytep buffer, png_uint_32 length)
|
||||||
|
{
|
||||||
|
if (setjmp(png_jmpbuf((*png_ptr))))
|
||||||
|
{
|
||||||
|
/* Free the png_ptr and info_ptr memory on error */
|
||||||
|
png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
|
||||||
|
return (ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This one's new also. Simply give it chunks of data as
|
||||||
|
* they arrive from the data stream (in order, of course).
|
||||||
|
* On Segmented machines, don't give it any more than 64K.
|
||||||
|
* The library seems to run fine with sizes of 4K, although
|
||||||
|
* you can give it much less if necessary (I assume you can
|
||||||
|
* give it chunks of 1 byte, but I haven't tried with less
|
||||||
|
* than 256 bytes yet). When this function returns, you may
|
||||||
|
* want to display any rows that were generated in the row
|
||||||
|
* callback, if you aren't already displaying them there.
|
||||||
|
*/
|
||||||
|
png_process_data(*png_ptr, *info_ptr, buffer, length);
|
||||||
|
return (OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
info_callback(png_structp png_ptr, png_infop info)
|
||||||
|
{
|
||||||
|
/* do any setup here, including setting any of the transformations
|
||||||
|
* mentioned in the Reading PNG files section. For now, you _must_
|
||||||
|
* call either png_start_read_image() or png_read_update_info()
|
||||||
|
* after all the transformations are set (even if you don't set
|
||||||
|
* any). You may start getting rows before png_process_data()
|
||||||
|
* returns, so this is your last chance to prepare for that.
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
row_callback(png_structp png_ptr, png_bytep new_row,
|
||||||
|
png_uint_32 row_num, int pass)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* This function is called for every row in the image. If the
|
||||||
|
* image is interlaced, and you turned on the interlace handler,
|
||||||
|
* this function will be called for every row in every pass.
|
||||||
|
*
|
||||||
|
* In this function you will receive a pointer to new row data from
|
||||||
|
* libpng called new_row that is to replace a corresponding row (of
|
||||||
|
* the same data format) in a buffer allocated by your application.
|
||||||
|
*
|
||||||
|
* The new row data pointer new_row may be NULL, indicating there is
|
||||||
|
* no new data to be replaced (in cases of interlace loading).
|
||||||
|
*
|
||||||
|
* If new_row is not NULL then you need to call
|
||||||
|
* png_progressive_combine_row() to replace the corresponding row as
|
||||||
|
* shown below:
|
||||||
|
*/
|
||||||
|
/* Check if row_num is in bounds. */
|
||||||
|
if((row_num >= 0) && (row_num < height))
|
||||||
|
{
|
||||||
|
/* Get pointer to corresponding row in our
|
||||||
|
* PNG read buffer.
|
||||||
|
*/
|
||||||
|
png_bytep old_row = ((png_bytep *)our_data)[row_num];
|
||||||
|
|
||||||
|
/* If both rows are allocated then copy the new row
|
||||||
|
* data to the corresponding row data.
|
||||||
|
*/
|
||||||
|
if((old_row != NULL) && (new_row != NULL))
|
||||||
|
png_progressive_combine_row(png_ptr, old_row, new_row);
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* 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 new row and the
|
||||||
|
* old row, as demonstrated above. You can call this function for
|
||||||
|
* NULL rows (it will just return) and for non-interlaced images
|
||||||
|
* (it just does the png_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 as new_row, and the function will combine
|
||||||
|
* the old row and the new row.
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
end_callback(png_structp png_ptr, png_infop info)
|
||||||
|
{
|
||||||
|
/* 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.
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
/* write a png file */
|
||||||
|
void write_png(char *file_name /* , ... other image information ... */)
|
||||||
|
{
|
||||||
|
FILE *fp;
|
||||||
|
png_structp png_ptr;
|
||||||
|
png_infop info_ptr;
|
||||||
|
png_colorp palette;
|
||||||
|
|
||||||
|
/* open the file */
|
||||||
|
fp = fopen(file_name, "wb");
|
||||||
|
if (fp == NULL)
|
||||||
|
return (ERROR);
|
||||||
|
|
||||||
|
/* Create and initialize the png_struct with the desired error handler
|
||||||
|
* functions. If you want to use the default stderr and longjump method,
|
||||||
|
* you can supply NULL for the last three parameters. We also check that
|
||||||
|
* the library version is compatible with the one used at compile time,
|
||||||
|
* in case we are using dynamically linked libraries. REQUIRED.
|
||||||
|
*/
|
||||||
|
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
|
||||||
|
png_voidp user_error_ptr, user_error_fn, user_warning_fn);
|
||||||
|
|
||||||
|
if (png_ptr == NULL)
|
||||||
|
{
|
||||||
|
fclose(fp);
|
||||||
|
return (ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Allocate/initialize the image information data. REQUIRED */
|
||||||
|
info_ptr = png_create_info_struct(png_ptr);
|
||||||
|
if (info_ptr == NULL)
|
||||||
|
{
|
||||||
|
fclose(fp);
|
||||||
|
png_destroy_write_struct(&png_ptr, png_infopp_NULL);
|
||||||
|
return (ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Set error handling. REQUIRED if you aren't supplying your own
|
||||||
|
* error handling functions in the png_create_write_struct() call.
|
||||||
|
*/
|
||||||
|
if (setjmp(png_jmpbuf(png_ptr)))
|
||||||
|
{
|
||||||
|
/* If we get here, we had a problem reading the file */
|
||||||
|
fclose(fp);
|
||||||
|
png_destroy_write_struct(&png_ptr, &info_ptr);
|
||||||
|
return (ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* One of the following I/O initialization functions is REQUIRED */
|
||||||
|
#ifdef streams /* I/O initialization method 1 */
|
||||||
|
/* set up the output control if you are using standard C streams */
|
||||||
|
png_init_io(png_ptr, fp);
|
||||||
|
#else no_streams /* I/O initialization method 2 */
|
||||||
|
/* If you are using replacement read functions, instead of calling
|
||||||
|
* png_init_io() here you would call */
|
||||||
|
png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn,
|
||||||
|
user_IO_flush_function);
|
||||||
|
/* where user_io_ptr is a structure you want available to the callbacks */
|
||||||
|
#endif no_streams /* only use one initialization method */
|
||||||
|
|
||||||
|
#ifdef hilevel
|
||||||
|
/* This is the easy way. Use it if you already have all the
|
||||||
|
* image info living info in the structure. You could "|" many
|
||||||
|
* PNG_TRANSFORM flags into the png_transforms integer here.
|
||||||
|
*/
|
||||||
|
png_write_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
|
||||||
|
#else
|
||||||
|
/* This is the hard way */
|
||||||
|
|
||||||
|
/* Set the image information here. Width and height are up to 2^31,
|
||||||
|
* bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
|
||||||
|
* the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
|
||||||
|
* PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
|
||||||
|
* or PNG_COLOR_TYPE_RGB_ALPHA. interlace is either PNG_INTERLACE_NONE or
|
||||||
|
* PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
|
||||||
|
* currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED
|
||||||
|
*/
|
||||||
|
png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, PNG_COLOR_TYPE_???,
|
||||||
|
PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
|
||||||
|
|
||||||
|
/* set the palette if there is one. REQUIRED for indexed-color images */
|
||||||
|
palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH
|
||||||
|
* png_sizeof (png_color));
|
||||||
|
/* ... set palette colors ... */
|
||||||
|
png_set_PLTE(png_ptr, info_ptr, palette, PNG_MAX_PALETTE_LENGTH);
|
||||||
|
/* You must not free palette here, because png_set_PLTE only makes a link to
|
||||||
|
the palette that you malloced. Wait until you are about to destroy
|
||||||
|
the png structure. */
|
||||||
|
|
||||||
|
/* optional significant bit chunk */
|
||||||
|
/* if we are dealing with a grayscale image then */
|
||||||
|
sig_bit.gray = true_bit_depth;
|
||||||
|
/* otherwise, if we are dealing with a color image then */
|
||||||
|
sig_bit.red = true_red_bit_depth;
|
||||||
|
sig_bit.green = true_green_bit_depth;
|
||||||
|
sig_bit.blue = true_blue_bit_depth;
|
||||||
|
/* if the image has an alpha channel then */
|
||||||
|
sig_bit.alpha = true_alpha_bit_depth;
|
||||||
|
png_set_sBIT(png_ptr, info_ptr, sig_bit);
|
||||||
|
|
||||||
|
|
||||||
|
/* Optional gamma chunk is strongly suggested if you have any guess
|
||||||
|
* as to the correct gamma of the image.
|
||||||
|
*/
|
||||||
|
png_set_gAMA(png_ptr, info_ptr, gamma);
|
||||||
|
|
||||||
|
/* Optionally write comments into the image */
|
||||||
|
text_ptr[0].key = "Title";
|
||||||
|
text_ptr[0].text = "Mona Lisa";
|
||||||
|
text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
|
||||||
|
text_ptr[1].key = "Author";
|
||||||
|
text_ptr[1].text = "Leonardo DaVinci";
|
||||||
|
text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
|
||||||
|
text_ptr[2].key = "Description";
|
||||||
|
text_ptr[2].text = "<long text>";
|
||||||
|
text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt;
|
||||||
|
#ifdef PNG_iTXt_SUPPORTED
|
||||||
|
text_ptr[0].lang = NULL;
|
||||||
|
text_ptr[1].lang = NULL;
|
||||||
|
text_ptr[2].lang = NULL;
|
||||||
|
#endif
|
||||||
|
png_set_text(png_ptr, info_ptr, text_ptr, 3);
|
||||||
|
|
||||||
|
/* other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs, */
|
||||||
|
/* note that if sRGB is present the gAMA and cHRM chunks must be ignored
|
||||||
|
* on read and must be written in accordance with the sRGB profile */
|
||||||
|
|
||||||
|
/* Write the file header information. REQUIRED */
|
||||||
|
png_write_info(png_ptr, info_ptr);
|
||||||
|
|
||||||
|
/* If you want, you can write the info in two steps, in case you need to
|
||||||
|
* write your private chunk ahead of PLTE:
|
||||||
|
*
|
||||||
|
* png_write_info_before_PLTE(write_ptr, write_info_ptr);
|
||||||
|
* write_my_chunk();
|
||||||
|
* png_write_info(png_ptr, info_ptr);
|
||||||
|
*
|
||||||
|
* However, given the level of known- and unknown-chunk support in 1.1.0
|
||||||
|
* and up, this should no longer be necessary.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Once we write out the header, the compression type on the text
|
||||||
|
* chunks gets changed to PNG_TEXT_COMPRESSION_NONE_WR or
|
||||||
|
* PNG_TEXT_COMPRESSION_zTXt_WR, so it doesn't get written out again
|
||||||
|
* at the end.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* set up the transformations you want. Note that these are
|
||||||
|
* all optional. Only call them if you want them.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* invert monochrome pixels */
|
||||||
|
png_set_invert_mono(png_ptr);
|
||||||
|
|
||||||
|
/* Shift the pixels up to a legal bit depth and fill in
|
||||||
|
* as appropriate to correctly scale the image.
|
||||||
|
*/
|
||||||
|
png_set_shift(png_ptr, &sig_bit);
|
||||||
|
|
||||||
|
/* pack pixels into bytes */
|
||||||
|
png_set_packing(png_ptr);
|
||||||
|
|
||||||
|
/* swap location of alpha bytes from ARGB to RGBA */
|
||||||
|
png_set_swap_alpha(png_ptr);
|
||||||
|
|
||||||
|
/* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into
|
||||||
|
* RGB (4 channels -> 3 channels). The second parameter is not used.
|
||||||
|
*/
|
||||||
|
png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
|
||||||
|
|
||||||
|
/* flip BGR pixels to RGB */
|
||||||
|
png_set_bgr(png_ptr);
|
||||||
|
|
||||||
|
/* swap bytes of 16-bit files to most significant byte first */
|
||||||
|
png_set_swap(png_ptr);
|
||||||
|
|
||||||
|
/* swap bits of 1, 2, 4 bit packed pixel formats */
|
||||||
|
png_set_packswap(png_ptr);
|
||||||
|
|
||||||
|
/* turn on interlace handling if you are not using png_write_image() */
|
||||||
|
if (interlacing)
|
||||||
|
number_passes = png_set_interlace_handling(png_ptr);
|
||||||
|
else
|
||||||
|
number_passes = 1;
|
||||||
|
|
||||||
|
/* The easiest way to write the image (you may have a different memory
|
||||||
|
* layout, however, so choose what fits your needs best). You need to
|
||||||
|
* use the first method if you aren't handling interlacing yourself.
|
||||||
|
*/
|
||||||
|
png_uint_32 k, height, width;
|
||||||
|
png_byte image[height][width*bytes_per_pixel];
|
||||||
|
png_bytep row_pointers[height];
|
||||||
|
|
||||||
|
if (height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
|
||||||
|
png_error (png_ptr, "Image is too tall to process in memory");
|
||||||
|
|
||||||
|
for (k = 0; k < height; k++)
|
||||||
|
row_pointers[k] = image + k*width*bytes_per_pixel;
|
||||||
|
|
||||||
|
/* One of the following output methods is REQUIRED */
|
||||||
|
#ifdef entire /* write out the entire image data in one call */
|
||||||
|
png_write_image(png_ptr, row_pointers);
|
||||||
|
|
||||||
|
/* the other way to write the image - deal with interlacing */
|
||||||
|
|
||||||
|
#else no_entire /* write out the image data by one or more scanlines */
|
||||||
|
/* The number of passes is either 1 for non-interlaced images,
|
||||||
|
* or 7 for interlaced images.
|
||||||
|
*/
|
||||||
|
for (pass = 0; pass < number_passes; pass++)
|
||||||
|
{
|
||||||
|
/* Write a few rows at a time. */
|
||||||
|
png_write_rows(png_ptr, &row_pointers[first_row], number_of_rows);
|
||||||
|
|
||||||
|
/* If you are only writing one row at a time, this works */
|
||||||
|
for (y = 0; y < height; y++)
|
||||||
|
{
|
||||||
|
png_write_rows(png_ptr, &row_pointers[y], 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif no_entire /* use only one output method */
|
||||||
|
|
||||||
|
/* You can write optional chunks like tEXt, zTXt, and tIME at the end
|
||||||
|
* as well. Shouldn't be necessary in 1.1.0 and up as all the public
|
||||||
|
* chunks are supported and you can use png_set_unknown_chunks() to
|
||||||
|
* register unknown chunks into the info structure to be written out.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* It is REQUIRED to call this to finish writing the rest of the file */
|
||||||
|
png_write_end(png_ptr, info_ptr);
|
||||||
|
#endif hilevel
|
||||||
|
|
||||||
|
/* If you png_malloced a palette, free it here (don't free info_ptr->palette,
|
||||||
|
as recommended in versions 1.0.5m and earlier of this example; if
|
||||||
|
libpng mallocs info_ptr->palette, libpng will free it). If you
|
||||||
|
allocated it with malloc() instead of png_malloc(), use free() instead
|
||||||
|
of png_free(). */
|
||||||
|
png_free(png_ptr, palette);
|
||||||
|
palette=NULL;
|
||||||
|
|
||||||
|
/* Similarly, if you png_malloced any data that you passed in with
|
||||||
|
png_set_something(), such as a hist or trans array, free it here,
|
||||||
|
when you can be sure that libpng is through with it. */
|
||||||
|
png_free(png_ptr, trans);
|
||||||
|
trans=NULL;
|
||||||
|
|
||||||
|
/* clean up after the write, and free any memory allocated */
|
||||||
|
png_destroy_write_struct(&png_ptr, &info_ptr);
|
||||||
|
|
||||||
|
/* close the file */
|
||||||
|
fclose(fp);
|
||||||
|
|
||||||
|
/* that's it */
|
||||||
|
return (OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* if 0 */
|
||||||
|
|
@ -0,0 +1,856 @@
|
||||||
|
|
||||||
|
/* png.c - location for general purpose libpng functions
|
||||||
|
*
|
||||||
|
* Last changed in libpng 1.2.15 January 5, 2007
|
||||||
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
|
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
|
||||||
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define PNG_INTERNAL
|
||||||
|
#define PNG_NO_EXTERN
|
||||||
|
#include "png.h"
|
||||||
|
|
||||||
|
/* Generate a compiler error if there is an old png.h in the search path. */
|
||||||
|
typedef version_1_2_16 Your_png_h_is_not_version_1_2_16;
|
||||||
|
|
||||||
|
/* Version information for C files. This had better match the version
|
||||||
|
* string defined in png.h. */
|
||||||
|
|
||||||
|
#ifdef PNG_USE_GLOBAL_ARRAYS
|
||||||
|
/* png_libpng_ver was changed to a function in version 1.0.5c */
|
||||||
|
const char png_libpng_ver[18] = PNG_LIBPNG_VER_STRING;
|
||||||
|
|
||||||
|
#ifdef PNG_READ_SUPPORTED
|
||||||
|
|
||||||
|
/* png_sig was changed to a function in version 1.0.5c */
|
||||||
|
/* Place to hold the signature string for a PNG file. */
|
||||||
|
const png_byte FARDATA png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
|
||||||
|
#endif /* PNG_READ_SUPPORTED */
|
||||||
|
|
||||||
|
/* Invoke global declarations for constant strings for known chunk types */
|
||||||
|
PNG_IHDR;
|
||||||
|
PNG_IDAT;
|
||||||
|
PNG_IEND;
|
||||||
|
PNG_PLTE;
|
||||||
|
PNG_bKGD;
|
||||||
|
PNG_cHRM;
|
||||||
|
PNG_gAMA;
|
||||||
|
PNG_hIST;
|
||||||
|
PNG_iCCP;
|
||||||
|
PNG_iTXt;
|
||||||
|
PNG_oFFs;
|
||||||
|
PNG_pCAL;
|
||||||
|
PNG_sCAL;
|
||||||
|
PNG_pHYs;
|
||||||
|
PNG_sBIT;
|
||||||
|
PNG_sPLT;
|
||||||
|
PNG_sRGB;
|
||||||
|
PNG_tEXt;
|
||||||
|
PNG_tIME;
|
||||||
|
PNG_tRNS;
|
||||||
|
PNG_zTXt;
|
||||||
|
|
||||||
|
#ifdef PNG_READ_SUPPORTED
|
||||||
|
/* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
|
||||||
|
|
||||||
|
/* start of interlace block */
|
||||||
|
const int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
|
||||||
|
|
||||||
|
/* offset to next interlace block */
|
||||||
|
const int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
|
||||||
|
|
||||||
|
/* start of interlace block in the y direction */
|
||||||
|
const int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
|
||||||
|
|
||||||
|
/* offset to next interlace block in the y direction */
|
||||||
|
const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
|
||||||
|
|
||||||
|
/* width of interlace block (used in assembler routines only) */
|
||||||
|
#ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW
|
||||||
|
const int FARDATA png_pass_width[] = {8, 4, 4, 2, 2, 1, 1};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Height of interlace block. This is not currently used - if you need
|
||||||
|
* it, uncomment it here and in png.h
|
||||||
|
const int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Mask to determine which pixels are valid in a pass */
|
||||||
|
const int FARDATA png_pass_mask[] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
|
||||||
|
|
||||||
|
/* Mask to determine which pixels to overwrite while displaying */
|
||||||
|
const int FARDATA png_pass_dsp_mask[]
|
||||||
|
= {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
|
||||||
|
|
||||||
|
#endif /* PNG_READ_SUPPORTED */
|
||||||
|
#endif /* PNG_USE_GLOBAL_ARRAYS */
|
||||||
|
|
||||||
|
/* Tells libpng that we have already handled the first "num_bytes" bytes
|
||||||
|
* of the PNG file signature. If the PNG data is embedded into another
|
||||||
|
* stream we can set num_bytes = 8 so that libpng will not attempt to read
|
||||||
|
* or write any of the magic bytes before it starts on the IHDR.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef PNG_READ_SUPPORTED
|
||||||
|
void PNGAPI
|
||||||
|
png_set_sig_bytes(png_structp png_ptr, int num_bytes)
|
||||||
|
{
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_debug(1, "in png_set_sig_bytes\n");
|
||||||
|
if (num_bytes > 8)
|
||||||
|
png_error(png_ptr, "Too many bytes for PNG signature.");
|
||||||
|
|
||||||
|
png_ptr->sig_bytes = (png_byte)(num_bytes < 0 ? 0 : num_bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Checks whether the supplied bytes match the PNG signature. We allow
|
||||||
|
* checking less than the full 8-byte signature so that those apps that
|
||||||
|
* already read the first few bytes of a file to determine the file type
|
||||||
|
* can simply check the remaining bytes for extra assurance. Returns
|
||||||
|
* an integer less than, equal to, or greater than zero if sig is found,
|
||||||
|
* respectively, to be less than, to match, or be greater than the correct
|
||||||
|
* PNG signature (this is the same behaviour as strcmp, memcmp, etc).
|
||||||
|
*/
|
||||||
|
int PNGAPI
|
||||||
|
png_sig_cmp(png_bytep sig, png_size_t start, png_size_t num_to_check)
|
||||||
|
{
|
||||||
|
png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
|
||||||
|
if (num_to_check > 8)
|
||||||
|
num_to_check = 8;
|
||||||
|
else if (num_to_check < 1)
|
||||||
|
return (-1);
|
||||||
|
|
||||||
|
if (start > 7)
|
||||||
|
return (-1);
|
||||||
|
|
||||||
|
if (start + num_to_check > 8)
|
||||||
|
num_to_check = 8 - start;
|
||||||
|
|
||||||
|
return ((int)(png_memcmp(&sig[start], &png_signature[start], num_to_check)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
|
||||||
|
/* (Obsolete) function to check signature bytes. It does not allow one
|
||||||
|
* to check a partial signature. This function might be removed in the
|
||||||
|
* future - use png_sig_cmp(). Returns true (nonzero) if the file is a PNG.
|
||||||
|
*/
|
||||||
|
int PNGAPI
|
||||||
|
png_check_sig(png_bytep sig, int num)
|
||||||
|
{
|
||||||
|
return ((int)!png_sig_cmp(sig, (png_size_t)0, (png_size_t)num));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif /* PNG_READ_SUPPORTED */
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
|
||||||
|
/* Function to allocate memory for zlib and clear it to 0. */
|
||||||
|
#ifdef PNG_1_0_X
|
||||||
|
voidpf PNGAPI
|
||||||
|
#else
|
||||||
|
voidpf /* private */
|
||||||
|
#endif
|
||||||
|
png_zalloc(voidpf png_ptr, uInt items, uInt size)
|
||||||
|
{
|
||||||
|
png_voidp ptr;
|
||||||
|
png_structp p=(png_structp)png_ptr;
|
||||||
|
png_uint_32 save_flags=p->flags;
|
||||||
|
png_uint_32 num_bytes;
|
||||||
|
|
||||||
|
if(png_ptr == NULL) return (NULL);
|
||||||
|
if (items > PNG_UINT_32_MAX/size)
|
||||||
|
{
|
||||||
|
png_warning (p, "Potential overflow in png_zalloc()");
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
|
num_bytes = (png_uint_32)items * size;
|
||||||
|
|
||||||
|
p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
|
||||||
|
ptr = (png_voidp)png_malloc((png_structp)png_ptr, num_bytes);
|
||||||
|
p->flags=save_flags;
|
||||||
|
|
||||||
|
#if defined(PNG_1_0_X) && !defined(PNG_NO_ZALLOC_ZERO)
|
||||||
|
if (ptr == NULL)
|
||||||
|
return ((voidpf)ptr);
|
||||||
|
|
||||||
|
if (num_bytes > (png_uint_32)0x8000L)
|
||||||
|
{
|
||||||
|
png_memset(ptr, 0, (png_size_t)0x8000L);
|
||||||
|
png_memset((png_bytep)ptr + (png_size_t)0x8000L, 0,
|
||||||
|
(png_size_t)(num_bytes - (png_uint_32)0x8000L));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
png_memset(ptr, 0, (png_size_t)num_bytes);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return ((voidpf)ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* function to free memory for zlib */
|
||||||
|
#ifdef PNG_1_0_X
|
||||||
|
void PNGAPI
|
||||||
|
#else
|
||||||
|
void /* private */
|
||||||
|
#endif
|
||||||
|
png_zfree(voidpf png_ptr, voidpf ptr)
|
||||||
|
{
|
||||||
|
png_free((png_structp)png_ptr, (png_voidp)ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Reset the CRC variable to 32 bits of 1's. Care must be taken
|
||||||
|
* in case CRC is > 32 bits to leave the top bits 0.
|
||||||
|
*/
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_reset_crc(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_ptr->crc = crc32(0, Z_NULL, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Calculate the CRC over a section of data. We can only pass as
|
||||||
|
* much data to this routine as the largest single buffer size. We
|
||||||
|
* also check that this data will actually be used before going to the
|
||||||
|
* trouble of calculating it.
|
||||||
|
*/
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_calculate_crc(png_structp png_ptr, png_bytep ptr, png_size_t length)
|
||||||
|
{
|
||||||
|
int need_crc = 1;
|
||||||
|
|
||||||
|
if (png_ptr->chunk_name[0] & 0x20) /* ancillary */
|
||||||
|
{
|
||||||
|
if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
|
||||||
|
(PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
|
||||||
|
need_crc = 0;
|
||||||
|
}
|
||||||
|
else /* critical */
|
||||||
|
{
|
||||||
|
if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
|
||||||
|
need_crc = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (need_crc)
|
||||||
|
png_ptr->crc = crc32(png_ptr->crc, ptr, (uInt)length);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Allocate the memory for an info_struct for the application. We don't
|
||||||
|
* really need the png_ptr, but it could potentially be useful in the
|
||||||
|
* future. This should be used in favour of malloc(png_sizeof(png_info))
|
||||||
|
* and png_info_init() so that applications that want to use a shared
|
||||||
|
* libpng don't have to be recompiled if png_info changes size.
|
||||||
|
*/
|
||||||
|
png_infop PNGAPI
|
||||||
|
png_create_info_struct(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_infop info_ptr;
|
||||||
|
|
||||||
|
png_debug(1, "in png_create_info_struct\n");
|
||||||
|
if(png_ptr == NULL) return (NULL);
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
info_ptr = (png_infop)png_create_struct_2(PNG_STRUCT_INFO,
|
||||||
|
png_ptr->malloc_fn, png_ptr->mem_ptr);
|
||||||
|
#else
|
||||||
|
info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
|
||||||
|
#endif
|
||||||
|
if (info_ptr != NULL)
|
||||||
|
png_info_init_3(&info_ptr, png_sizeof(png_info));
|
||||||
|
|
||||||
|
return (info_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This function frees the memory associated with a single info struct.
|
||||||
|
* Normally, one would use either png_destroy_read_struct() or
|
||||||
|
* png_destroy_write_struct() to free an info struct, but this may be
|
||||||
|
* useful for some applications.
|
||||||
|
*/
|
||||||
|
void PNGAPI
|
||||||
|
png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
|
||||||
|
{
|
||||||
|
png_infop info_ptr = NULL;
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
|
||||||
|
png_debug(1, "in png_destroy_info_struct\n");
|
||||||
|
if (info_ptr_ptr != NULL)
|
||||||
|
info_ptr = *info_ptr_ptr;
|
||||||
|
|
||||||
|
if (info_ptr != NULL)
|
||||||
|
{
|
||||||
|
png_info_destroy(png_ptr, info_ptr);
|
||||||
|
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
png_destroy_struct_2((png_voidp)info_ptr, png_ptr->free_fn,
|
||||||
|
png_ptr->mem_ptr);
|
||||||
|
#else
|
||||||
|
png_destroy_struct((png_voidp)info_ptr);
|
||||||
|
#endif
|
||||||
|
*info_ptr_ptr = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Initialize the info structure. This is now an internal function (0.89)
|
||||||
|
* and applications using it are urged to use png_create_info_struct()
|
||||||
|
* instead.
|
||||||
|
*/
|
||||||
|
#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
|
||||||
|
#undef png_info_init
|
||||||
|
void PNGAPI
|
||||||
|
png_info_init(png_infop info_ptr)
|
||||||
|
{
|
||||||
|
/* We only come here via pre-1.0.12-compiled applications */
|
||||||
|
png_info_init_3(&info_ptr, 0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void PNGAPI
|
||||||
|
png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
|
||||||
|
{
|
||||||
|
png_infop info_ptr = *ptr_ptr;
|
||||||
|
|
||||||
|
if(info_ptr == NULL) return;
|
||||||
|
|
||||||
|
png_debug(1, "in png_info_init_3\n");
|
||||||
|
|
||||||
|
if(png_sizeof(png_info) > png_info_struct_size)
|
||||||
|
{
|
||||||
|
png_destroy_struct(info_ptr);
|
||||||
|
info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
|
||||||
|
*ptr_ptr = info_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* set everything to 0 */
|
||||||
|
png_memset(info_ptr, 0, png_sizeof (png_info));
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
void PNGAPI
|
||||||
|
png_data_freer(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
int freer, png_uint_32 mask)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_data_freer\n");
|
||||||
|
if (png_ptr == NULL || info_ptr == NULL)
|
||||||
|
return;
|
||||||
|
if(freer == PNG_DESTROY_WILL_FREE_DATA)
|
||||||
|
info_ptr->free_me |= mask;
|
||||||
|
else if(freer == PNG_USER_WILL_FREE_DATA)
|
||||||
|
info_ptr->free_me &= ~mask;
|
||||||
|
else
|
||||||
|
png_warning(png_ptr,
|
||||||
|
"Unknown freer parameter in png_data_freer.");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void PNGAPI
|
||||||
|
png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
|
||||||
|
int num)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_free_data\n");
|
||||||
|
if (png_ptr == NULL || info_ptr == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
#if defined(PNG_TEXT_SUPPORTED)
|
||||||
|
/* free text item num or (if num == -1) all text items */
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if ((mask & PNG_FREE_TEXT) & info_ptr->free_me)
|
||||||
|
#else
|
||||||
|
if (mask & PNG_FREE_TEXT)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if (num != -1)
|
||||||
|
{
|
||||||
|
if (info_ptr->text && info_ptr->text[num].key)
|
||||||
|
{
|
||||||
|
png_free(png_ptr, info_ptr->text[num].key);
|
||||||
|
info_ptr->text[num].key = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < info_ptr->num_text; i++)
|
||||||
|
png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, i);
|
||||||
|
png_free(png_ptr, info_ptr->text);
|
||||||
|
info_ptr->text = NULL;
|
||||||
|
info_ptr->num_text=0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_tRNS_SUPPORTED)
|
||||||
|
/* free any tRNS entry */
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if ((mask & PNG_FREE_TRNS) & info_ptr->free_me)
|
||||||
|
#else
|
||||||
|
if ((mask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS))
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
png_free(png_ptr, info_ptr->trans);
|
||||||
|
info_ptr->valid &= ~PNG_INFO_tRNS;
|
||||||
|
#ifndef PNG_FREE_ME_SUPPORTED
|
||||||
|
png_ptr->flags &= ~PNG_FLAG_FREE_TRNS;
|
||||||
|
#endif
|
||||||
|
info_ptr->trans = NULL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_sCAL_SUPPORTED)
|
||||||
|
/* free any sCAL entry */
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if ((mask & PNG_FREE_SCAL) & info_ptr->free_me)
|
||||||
|
#else
|
||||||
|
if (mask & PNG_FREE_SCAL)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
|
||||||
|
png_free(png_ptr, info_ptr->scal_s_width);
|
||||||
|
png_free(png_ptr, info_ptr->scal_s_height);
|
||||||
|
info_ptr->scal_s_width = NULL;
|
||||||
|
info_ptr->scal_s_height = NULL;
|
||||||
|
#endif
|
||||||
|
info_ptr->valid &= ~PNG_INFO_sCAL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_pCAL_SUPPORTED)
|
||||||
|
/* free any pCAL entry */
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if ((mask & PNG_FREE_PCAL) & info_ptr->free_me)
|
||||||
|
#else
|
||||||
|
if (mask & PNG_FREE_PCAL)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
png_free(png_ptr, info_ptr->pcal_purpose);
|
||||||
|
png_free(png_ptr, info_ptr->pcal_units);
|
||||||
|
info_ptr->pcal_purpose = NULL;
|
||||||
|
info_ptr->pcal_units = NULL;
|
||||||
|
if (info_ptr->pcal_params != NULL)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < (int)info_ptr->pcal_nparams; i++)
|
||||||
|
{
|
||||||
|
png_free(png_ptr, info_ptr->pcal_params[i]);
|
||||||
|
info_ptr->pcal_params[i]=NULL;
|
||||||
|
}
|
||||||
|
png_free(png_ptr, info_ptr->pcal_params);
|
||||||
|
info_ptr->pcal_params = NULL;
|
||||||
|
}
|
||||||
|
info_ptr->valid &= ~PNG_INFO_pCAL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_iCCP_SUPPORTED)
|
||||||
|
/* free any iCCP entry */
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if ((mask & PNG_FREE_ICCP) & info_ptr->free_me)
|
||||||
|
#else
|
||||||
|
if (mask & PNG_FREE_ICCP)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
png_free(png_ptr, info_ptr->iccp_name);
|
||||||
|
png_free(png_ptr, info_ptr->iccp_profile);
|
||||||
|
info_ptr->iccp_name = NULL;
|
||||||
|
info_ptr->iccp_profile = NULL;
|
||||||
|
info_ptr->valid &= ~PNG_INFO_iCCP;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_sPLT_SUPPORTED)
|
||||||
|
/* free a given sPLT entry, or (if num == -1) all sPLT entries */
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if ((mask & PNG_FREE_SPLT) & info_ptr->free_me)
|
||||||
|
#else
|
||||||
|
if (mask & PNG_FREE_SPLT)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if (num != -1)
|
||||||
|
{
|
||||||
|
if(info_ptr->splt_palettes)
|
||||||
|
{
|
||||||
|
png_free(png_ptr, info_ptr->splt_palettes[num].name);
|
||||||
|
png_free(png_ptr, info_ptr->splt_palettes[num].entries);
|
||||||
|
info_ptr->splt_palettes[num].name = NULL;
|
||||||
|
info_ptr->splt_palettes[num].entries = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if(info_ptr->splt_palettes_num)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
|
||||||
|
png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, i);
|
||||||
|
|
||||||
|
png_free(png_ptr, info_ptr->splt_palettes);
|
||||||
|
info_ptr->splt_palettes = NULL;
|
||||||
|
info_ptr->splt_palettes_num = 0;
|
||||||
|
}
|
||||||
|
info_ptr->valid &= ~PNG_INFO_sPLT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
|
||||||
|
#else
|
||||||
|
if (mask & PNG_FREE_UNKN)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if (num != -1)
|
||||||
|
{
|
||||||
|
if(info_ptr->unknown_chunks)
|
||||||
|
{
|
||||||
|
png_free(png_ptr, info_ptr->unknown_chunks[num].data);
|
||||||
|
info_ptr->unknown_chunks[num].data = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if(info_ptr->unknown_chunks_num)
|
||||||
|
{
|
||||||
|
for (i = 0; i < (int)info_ptr->unknown_chunks_num; i++)
|
||||||
|
png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, i);
|
||||||
|
|
||||||
|
png_free(png_ptr, info_ptr->unknown_chunks);
|
||||||
|
info_ptr->unknown_chunks = NULL;
|
||||||
|
info_ptr->unknown_chunks_num = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_hIST_SUPPORTED)
|
||||||
|
/* free any hIST entry */
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if ((mask & PNG_FREE_HIST) & info_ptr->free_me)
|
||||||
|
#else
|
||||||
|
if ((mask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST))
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
png_free(png_ptr, info_ptr->hist);
|
||||||
|
info_ptr->hist = NULL;
|
||||||
|
info_ptr->valid &= ~PNG_INFO_hIST;
|
||||||
|
#ifndef PNG_FREE_ME_SUPPORTED
|
||||||
|
png_ptr->flags &= ~PNG_FLAG_FREE_HIST;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* free any PLTE entry that was internally allocated */
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if ((mask & PNG_FREE_PLTE) & info_ptr->free_me)
|
||||||
|
#else
|
||||||
|
if ((mask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE))
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
png_zfree(png_ptr, info_ptr->palette);
|
||||||
|
info_ptr->palette = NULL;
|
||||||
|
info_ptr->valid &= ~PNG_INFO_PLTE;
|
||||||
|
#ifndef PNG_FREE_ME_SUPPORTED
|
||||||
|
png_ptr->flags &= ~PNG_FLAG_FREE_PLTE;
|
||||||
|
#endif
|
||||||
|
info_ptr->num_palette = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_INFO_IMAGE_SUPPORTED)
|
||||||
|
/* free any image bits attached to the info structure */
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if ((mask & PNG_FREE_ROWS) & info_ptr->free_me)
|
||||||
|
#else
|
||||||
|
if (mask & PNG_FREE_ROWS)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if(info_ptr->row_pointers)
|
||||||
|
{
|
||||||
|
int row;
|
||||||
|
for (row = 0; row < (int)info_ptr->height; row++)
|
||||||
|
{
|
||||||
|
png_free(png_ptr, info_ptr->row_pointers[row]);
|
||||||
|
info_ptr->row_pointers[row]=NULL;
|
||||||
|
}
|
||||||
|
png_free(png_ptr, info_ptr->row_pointers);
|
||||||
|
info_ptr->row_pointers=NULL;
|
||||||
|
}
|
||||||
|
info_ptr->valid &= ~PNG_INFO_IDAT;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef PNG_FREE_ME_SUPPORTED
|
||||||
|
if(num == -1)
|
||||||
|
info_ptr->free_me &= ~mask;
|
||||||
|
else
|
||||||
|
info_ptr->free_me &= ~(mask & ~PNG_FREE_MUL);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This is an internal routine to free any memory that the info struct is
|
||||||
|
* pointing to before re-using it or freeing the struct itself. Recall
|
||||||
|
* that png_free() checks for NULL pointers for us.
|
||||||
|
*/
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_info_destroy(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_info_destroy\n");
|
||||||
|
|
||||||
|
png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
|
||||||
|
|
||||||
|
#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
|
||||||
|
if (png_ptr->num_chunk_list)
|
||||||
|
{
|
||||||
|
png_free(png_ptr, png_ptr->chunk_list);
|
||||||
|
png_ptr->chunk_list=NULL;
|
||||||
|
png_ptr->num_chunk_list=0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
png_info_init_3(&info_ptr, png_sizeof(png_info));
|
||||||
|
}
|
||||||
|
#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
|
||||||
|
|
||||||
|
/* This function returns a pointer to the io_ptr associated with the user
|
||||||
|
* functions. The application should free any memory associated with this
|
||||||
|
* pointer before png_write_destroy() or png_read_destroy() are called.
|
||||||
|
*/
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_get_io_ptr(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
if(png_ptr == NULL) return (NULL);
|
||||||
|
return (png_ptr->io_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
|
||||||
|
#if !defined(PNG_NO_STDIO)
|
||||||
|
/* Initialize the default input/output functions for the PNG file. If you
|
||||||
|
* use your own read or write routines, you can call either png_set_read_fn()
|
||||||
|
* or png_set_write_fn() instead of png_init_io(). If you have defined
|
||||||
|
* PNG_NO_STDIO, you must use a function of your own because "FILE *" isn't
|
||||||
|
* necessarily available.
|
||||||
|
*/
|
||||||
|
void PNGAPI
|
||||||
|
png_init_io(png_structp png_ptr, png_FILE_p fp)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_init_io\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_ptr->io_ptr = (png_voidp)fp;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_TIME_RFC1123_SUPPORTED)
|
||||||
|
/* Convert the supplied time into an RFC 1123 string suitable for use in
|
||||||
|
* a "Creation Time" or other text-based time string.
|
||||||
|
*/
|
||||||
|
png_charp PNGAPI
|
||||||
|
png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)
|
||||||
|
{
|
||||||
|
static PNG_CONST char short_months[12][4] =
|
||||||
|
{"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
||||||
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
|
||||||
|
|
||||||
|
if(png_ptr == NULL) return (NULL);
|
||||||
|
if (png_ptr->time_buffer == NULL)
|
||||||
|
{
|
||||||
|
png_ptr->time_buffer = (png_charp)png_malloc(png_ptr, (png_uint_32)(29*
|
||||||
|
png_sizeof(char)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(_WIN32_WCE)
|
||||||
|
{
|
||||||
|
wchar_t time_buf[29];
|
||||||
|
wsprintf(time_buf, TEXT("%d %S %d %02d:%02d:%02d +0000"),
|
||||||
|
ptime->day % 32, short_months[(ptime->month - 1) % 12],
|
||||||
|
ptime->year, ptime->hour % 24, ptime->minute % 60,
|
||||||
|
ptime->second % 61);
|
||||||
|
WideCharToMultiByte(CP_ACP, 0, time_buf, -1, png_ptr->time_buffer, 29,
|
||||||
|
NULL, NULL);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#ifdef USE_FAR_KEYWORD
|
||||||
|
{
|
||||||
|
char near_time_buf[29];
|
||||||
|
sprintf(near_time_buf, "%d %s %d %02d:%02d:%02d +0000",
|
||||||
|
ptime->day % 32, short_months[(ptime->month - 1) % 12],
|
||||||
|
ptime->year, ptime->hour % 24, ptime->minute % 60,
|
||||||
|
ptime->second % 61);
|
||||||
|
png_memcpy(png_ptr->time_buffer, near_time_buf,
|
||||||
|
29*png_sizeof(char));
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
sprintf(png_ptr->time_buffer, "%d %s %d %02d:%02d:%02d +0000",
|
||||||
|
ptime->day % 32, short_months[(ptime->month - 1) % 12],
|
||||||
|
ptime->year, ptime->hour % 24, ptime->minute % 60,
|
||||||
|
ptime->second % 61);
|
||||||
|
#endif
|
||||||
|
#endif /* _WIN32_WCE */
|
||||||
|
return ((png_charp)png_ptr->time_buffer);
|
||||||
|
}
|
||||||
|
#endif /* PNG_TIME_RFC1123_SUPPORTED */
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* Signature string for a PNG file. */
|
||||||
|
png_bytep PNGAPI
|
||||||
|
png_sig_bytes(void)
|
||||||
|
{
|
||||||
|
return ((png_bytep)"\211\120\116\107\015\012\032\012");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
|
||||||
|
|
||||||
|
png_charp PNGAPI
|
||||||
|
png_get_copyright(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
|
||||||
|
return ((png_charp) "\n libpng version 1.2.16 - January 31, 2007\n\
|
||||||
|
Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\
|
||||||
|
Copyright (c) 1996-1997 Andreas Dilger\n\
|
||||||
|
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
|
||||||
|
return ((png_charp) "");
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The following return the library version as a short string in the
|
||||||
|
* format 1.0.0 through 99.99.99zz. To get the version of *.h files
|
||||||
|
* used with your application, print out PNG_LIBPNG_VER_STRING, which
|
||||||
|
* is defined in png.h.
|
||||||
|
* Note: now there is no difference between png_get_libpng_ver() and
|
||||||
|
* png_get_header_ver(). Due to the version_nn_nn_nn typedef guard,
|
||||||
|
* it is guaranteed that png.c uses the correct version of png.h.
|
||||||
|
*/
|
||||||
|
png_charp PNGAPI
|
||||||
|
png_get_libpng_ver(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
/* Version of *.c files used when building libpng */
|
||||||
|
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
|
||||||
|
return ((png_charp) PNG_LIBPNG_VER_STRING);
|
||||||
|
return ((png_charp) "");
|
||||||
|
}
|
||||||
|
|
||||||
|
png_charp PNGAPI
|
||||||
|
png_get_header_ver(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
/* Version of *.h files used when building libpng */
|
||||||
|
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
|
||||||
|
return ((png_charp) PNG_LIBPNG_VER_STRING);
|
||||||
|
return ((png_charp) "");
|
||||||
|
}
|
||||||
|
|
||||||
|
png_charp PNGAPI
|
||||||
|
png_get_header_version(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
/* Returns longer string containing both version and date */
|
||||||
|
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
|
||||||
|
return ((png_charp) PNG_HEADER_VERSION_STRING);
|
||||||
|
return ((png_charp) "");
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
|
||||||
|
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
|
||||||
|
int PNGAPI
|
||||||
|
png_handle_as_unknown(png_structp png_ptr, png_bytep chunk_name)
|
||||||
|
{
|
||||||
|
/* check chunk_name and return "keep" value if it's on the list, else 0 */
|
||||||
|
int i;
|
||||||
|
png_bytep p;
|
||||||
|
if((png_ptr == NULL && chunk_name == NULL) || png_ptr->num_chunk_list<=0)
|
||||||
|
return 0;
|
||||||
|
p=png_ptr->chunk_list+png_ptr->num_chunk_list*5-5;
|
||||||
|
for (i = png_ptr->num_chunk_list; i; i--, p-=5)
|
||||||
|
if (!png_memcmp(chunk_name, p, 4))
|
||||||
|
return ((int)*(p+4));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* This function, added to libpng-1.0.6g, is untested. */
|
||||||
|
int PNGAPI
|
||||||
|
png_reset_zstream(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr == NULL) return Z_STREAM_ERROR;
|
||||||
|
return (inflateReset(&png_ptr->zstream));
|
||||||
|
}
|
||||||
|
#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
|
||||||
|
|
||||||
|
/* This function was added to libpng-1.0.7 */
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_access_version_number(void)
|
||||||
|
{
|
||||||
|
/* Version of *.c files used when building libpng */
|
||||||
|
return((png_uint_32) PNG_LIBPNG_VER);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SUPPORTED) && defined(PNG_ASSEMBLER_CODE_SUPPORTED)
|
||||||
|
#if !defined(PNG_1_0_X)
|
||||||
|
#if defined(PNG_MMX_CODE_SUPPORTED)
|
||||||
|
/* this INTERNAL function was added to libpng 1.2.0 */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_init_mmx_flags (png_structp png_ptr)
|
||||||
|
{
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_ptr->mmx_rowbytes_threshold = 0;
|
||||||
|
png_ptr->mmx_bitdepth_threshold = 0;
|
||||||
|
|
||||||
|
# if (defined(PNG_USE_PNGVCRD) || defined(PNG_USE_PNGGCCRD))
|
||||||
|
|
||||||
|
png_ptr->asm_flags |= PNG_ASM_FLAG_MMX_SUPPORT_COMPILED;
|
||||||
|
|
||||||
|
if (png_mmx_support() > 0) {
|
||||||
|
png_ptr->asm_flags |= PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU
|
||||||
|
# ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW
|
||||||
|
| PNG_ASM_FLAG_MMX_READ_COMBINE_ROW
|
||||||
|
# endif
|
||||||
|
# ifdef PNG_HAVE_ASSEMBLER_READ_INTERLACE
|
||||||
|
| PNG_ASM_FLAG_MMX_READ_INTERLACE
|
||||||
|
# endif
|
||||||
|
# ifndef PNG_HAVE_ASSEMBLER_READ_FILTER_ROW
|
||||||
|
;
|
||||||
|
# else
|
||||||
|
| PNG_ASM_FLAG_MMX_READ_FILTER_SUB
|
||||||
|
| PNG_ASM_FLAG_MMX_READ_FILTER_UP
|
||||||
|
| PNG_ASM_FLAG_MMX_READ_FILTER_AVG
|
||||||
|
| PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ;
|
||||||
|
|
||||||
|
png_ptr->mmx_rowbytes_threshold = PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT;
|
||||||
|
png_ptr->mmx_bitdepth_threshold = PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT;
|
||||||
|
# endif
|
||||||
|
} else {
|
||||||
|
png_ptr->asm_flags &= ~( PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU
|
||||||
|
| PNG_MMX_READ_FLAGS
|
||||||
|
| PNG_MMX_WRITE_FLAGS );
|
||||||
|
}
|
||||||
|
|
||||||
|
# else /* !(PNGVCRD || PNGGCCRD) */
|
||||||
|
|
||||||
|
/* clear all MMX flags; no support is compiled in */
|
||||||
|
png_ptr->asm_flags &= ~( PNG_MMX_FLAGS );
|
||||||
|
|
||||||
|
# endif /* ?(PNGVCRD || PNGGCCRD) */
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* !(PNG_MMX_CODE_SUPPORTED) */
|
||||||
|
|
||||||
|
/* this function was added to libpng 1.2.0 */
|
||||||
|
#if !defined(PNG_USE_PNGGCCRD) && \
|
||||||
|
!(defined(PNG_MMX_CODE_SUPPORTED) && defined(PNG_USE_PNGVCRD))
|
||||||
|
int PNGAPI
|
||||||
|
png_mmx_support(void)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif /* PNG_1_0_X && PNG_ASSEMBLER_CODE_SUPPORTED */
|
||||||
|
#endif /* PNG_READ_SUPPORTED */
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
|
||||||
|
#ifdef PNG_SIZE_T
|
||||||
|
/* Added at libpng version 1.2.6 */
|
||||||
|
PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
|
||||||
|
png_size_t PNGAPI
|
||||||
|
png_convert_size(size_t size)
|
||||||
|
{
|
||||||
|
if (size > (png_size_t)-1)
|
||||||
|
PNG_ABORT(); /* We haven't got access to png_ptr, so no png_error() */
|
||||||
|
return ((png_size_t)size);
|
||||||
|
}
|
||||||
|
#endif /* PNG_SIZE_T */
|
||||||
|
#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,320 @@
|
||||||
|
|
||||||
|
/* pngerror.c - stub functions for i/o and memory allocation
|
||||||
|
*
|
||||||
|
* Last changed in libpng 1.2.13 November 13, 2006
|
||||||
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
|
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
|
||||||
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
|
*
|
||||||
|
* This file provides a location for all error handling. Users who
|
||||||
|
* need special error handling are expected to write replacement functions
|
||||||
|
* and use png_set_error_fn() to use those functions. See the instructions
|
||||||
|
* at each function.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define PNG_INTERNAL
|
||||||
|
#include "png.h"
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
|
||||||
|
static void /* PRIVATE */
|
||||||
|
png_default_error PNGARG((png_structp png_ptr,
|
||||||
|
png_const_charp error_message));
|
||||||
|
static void /* PRIVATE */
|
||||||
|
png_default_warning PNGARG((png_structp png_ptr,
|
||||||
|
png_const_charp warning_message));
|
||||||
|
|
||||||
|
/* This function is called whenever there is a fatal error. This function
|
||||||
|
* should not be changed. If there is a need to handle errors differently,
|
||||||
|
* you should supply a replacement error function and use png_set_error_fn()
|
||||||
|
* to replace the error function at run-time.
|
||||||
|
*/
|
||||||
|
void PNGAPI
|
||||||
|
png_error(png_structp png_ptr, png_const_charp error_message)
|
||||||
|
{
|
||||||
|
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
|
||||||
|
char msg[16];
|
||||||
|
if (png_ptr != NULL)
|
||||||
|
{
|
||||||
|
if (png_ptr->flags&
|
||||||
|
(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
|
||||||
|
{
|
||||||
|
if (*error_message == '#')
|
||||||
|
{
|
||||||
|
int offset;
|
||||||
|
for (offset=1; offset<15; offset++)
|
||||||
|
if (*(error_message+offset) == ' ')
|
||||||
|
break;
|
||||||
|
if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i=0; i<offset-1; i++)
|
||||||
|
msg[i]=error_message[i+1];
|
||||||
|
msg[i]='\0';
|
||||||
|
error_message=msg;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
error_message+=offset;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
|
||||||
|
{
|
||||||
|
msg[0]='0';
|
||||||
|
msg[1]='\0';
|
||||||
|
error_message=msg;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if (png_ptr != NULL && png_ptr->error_fn != NULL)
|
||||||
|
(*(png_ptr->error_fn))(png_ptr, error_message);
|
||||||
|
|
||||||
|
/* If the custom handler doesn't exist, or if it returns,
|
||||||
|
use the default handler, which will not return. */
|
||||||
|
png_default_error(png_ptr, error_message);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This function is called whenever there is a non-fatal error. This function
|
||||||
|
* should not be changed. If there is a need to handle warnings differently,
|
||||||
|
* you should supply a replacement warning function and use
|
||||||
|
* png_set_error_fn() to replace the warning function at run-time.
|
||||||
|
*/
|
||||||
|
void PNGAPI
|
||||||
|
png_warning(png_structp png_ptr, png_const_charp warning_message)
|
||||||
|
{
|
||||||
|
int offset = 0;
|
||||||
|
if (png_ptr != NULL)
|
||||||
|
{
|
||||||
|
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
|
||||||
|
if (png_ptr->flags&
|
||||||
|
(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if (*warning_message == '#')
|
||||||
|
{
|
||||||
|
for (offset=1; offset<15; offset++)
|
||||||
|
if (*(warning_message+offset) == ' ')
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (png_ptr != NULL && png_ptr->warning_fn != NULL)
|
||||||
|
(*(png_ptr->warning_fn))(png_ptr, warning_message+offset);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
png_default_warning(png_ptr, warning_message+offset);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* These utilities are used internally to build an error message that relates
|
||||||
|
* to the current chunk. The chunk name comes from png_ptr->chunk_name,
|
||||||
|
* this is used to prefix the message. The message is limited in length
|
||||||
|
* to 63 bytes, the name characters are output as hex digits wrapped in []
|
||||||
|
* if the character is invalid.
|
||||||
|
*/
|
||||||
|
#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
|
||||||
|
static PNG_CONST char png_digit[16] = {
|
||||||
|
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F'
|
||||||
|
};
|
||||||
|
|
||||||
|
static void /* PRIVATE */
|
||||||
|
png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
|
||||||
|
error_message)
|
||||||
|
{
|
||||||
|
int iout = 0, iin = 0;
|
||||||
|
|
||||||
|
while (iin < 4)
|
||||||
|
{
|
||||||
|
int c = png_ptr->chunk_name[iin++];
|
||||||
|
if (isnonalpha(c))
|
||||||
|
{
|
||||||
|
buffer[iout++] = '[';
|
||||||
|
buffer[iout++] = png_digit[(c & 0xf0) >> 4];
|
||||||
|
buffer[iout++] = png_digit[c & 0x0f];
|
||||||
|
buffer[iout++] = ']';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
buffer[iout++] = (png_byte)c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error_message == NULL)
|
||||||
|
buffer[iout] = 0;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
buffer[iout++] = ':';
|
||||||
|
buffer[iout++] = ' ';
|
||||||
|
png_strncpy(buffer+iout, error_message, 63);
|
||||||
|
buffer[iout+63] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void PNGAPI
|
||||||
|
png_chunk_error(png_structp png_ptr, png_const_charp error_message)
|
||||||
|
{
|
||||||
|
char msg[18+64];
|
||||||
|
if (png_ptr == NULL)
|
||||||
|
png_error(png_ptr, error_message);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
png_format_buffer(png_ptr, msg, error_message);
|
||||||
|
png_error(png_ptr, msg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void PNGAPI
|
||||||
|
png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
|
||||||
|
{
|
||||||
|
char msg[18+64];
|
||||||
|
if (png_ptr == NULL)
|
||||||
|
png_warning(png_ptr, warning_message);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
png_format_buffer(png_ptr, msg, warning_message);
|
||||||
|
png_warning(png_ptr, msg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This is the default error handling function. Note that replacements for
|
||||||
|
* this function MUST NOT RETURN, or the program will likely crash. This
|
||||||
|
* function is used by default, or if the program supplies NULL for the
|
||||||
|
* error function pointer in png_set_error_fn().
|
||||||
|
*/
|
||||||
|
static void /* PRIVATE */
|
||||||
|
png_default_error(png_structp png_ptr, png_const_charp error_message)
|
||||||
|
{
|
||||||
|
#ifndef PNG_NO_CONSOLE_IO
|
||||||
|
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
|
||||||
|
if (*error_message == '#')
|
||||||
|
{
|
||||||
|
int offset;
|
||||||
|
char error_number[16];
|
||||||
|
for (offset=0; offset<15; offset++)
|
||||||
|
{
|
||||||
|
error_number[offset] = *(error_message+offset+1);
|
||||||
|
if (*(error_message+offset) == ' ')
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if((offset > 1) && (offset < 15))
|
||||||
|
{
|
||||||
|
error_number[offset-1]='\0';
|
||||||
|
fprintf(stderr, "libpng error no. %s: %s\n", error_number,
|
||||||
|
error_message+offset);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
fprintf(stderr, "libpng error: %s, offset=%d\n", error_message,offset);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
fprintf(stderr, "libpng error: %s\n", error_message);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef PNG_SETJMP_SUPPORTED
|
||||||
|
if (png_ptr)
|
||||||
|
{
|
||||||
|
# ifdef USE_FAR_KEYWORD
|
||||||
|
{
|
||||||
|
jmp_buf jmpbuf;
|
||||||
|
png_memcpy(jmpbuf,png_ptr->jmpbuf,png_sizeof(jmp_buf));
|
||||||
|
longjmp(jmpbuf, 1);
|
||||||
|
}
|
||||||
|
# else
|
||||||
|
longjmp(png_ptr->jmpbuf, 1);
|
||||||
|
# endif
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
PNG_ABORT();
|
||||||
|
#endif
|
||||||
|
#ifdef PNG_NO_CONSOLE_IO
|
||||||
|
/* make compiler happy */ ;
|
||||||
|
if (&error_message != NULL)
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This function is called when there is a warning, but the library thinks
|
||||||
|
* it can continue anyway. Replacement functions don't have to do anything
|
||||||
|
* here if you don't want them to. In the default configuration, png_ptr is
|
||||||
|
* not used, but it is passed in case it may be useful.
|
||||||
|
*/
|
||||||
|
static void /* PRIVATE */
|
||||||
|
png_default_warning(png_structp png_ptr, png_const_charp warning_message)
|
||||||
|
{
|
||||||
|
#ifndef PNG_NO_CONSOLE_IO
|
||||||
|
# ifdef PNG_ERROR_NUMBERS_SUPPORTED
|
||||||
|
if (*warning_message == '#')
|
||||||
|
{
|
||||||
|
int offset;
|
||||||
|
char warning_number[16];
|
||||||
|
for (offset=0; offset<15; offset++)
|
||||||
|
{
|
||||||
|
warning_number[offset]=*(warning_message+offset+1);
|
||||||
|
if (*(warning_message+offset) == ' ')
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if((offset > 1) && (offset < 15))
|
||||||
|
{
|
||||||
|
warning_number[offset-1]='\0';
|
||||||
|
fprintf(stderr, "libpng warning no. %s: %s\n", warning_number,
|
||||||
|
warning_message+offset);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
fprintf(stderr, "libpng warning: %s\n", warning_message);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
# endif
|
||||||
|
fprintf(stderr, "libpng warning: %s\n", warning_message);
|
||||||
|
#else
|
||||||
|
/* make compiler happy */ ;
|
||||||
|
if (warning_message)
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
|
/* make compiler happy */ ;
|
||||||
|
if (png_ptr)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This function is called when the application wants to use another method
|
||||||
|
* of handling errors and warnings. Note that the error function MUST NOT
|
||||||
|
* return to the calling routine or serious problems will occur. The return
|
||||||
|
* method used in the default routine calls longjmp(png_ptr->jmpbuf, 1)
|
||||||
|
*/
|
||||||
|
void PNGAPI
|
||||||
|
png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
|
||||||
|
png_error_ptr error_fn, png_error_ptr warning_fn)
|
||||||
|
{
|
||||||
|
if (png_ptr == NULL)
|
||||||
|
return;
|
||||||
|
png_ptr->error_ptr = error_ptr;
|
||||||
|
png_ptr->error_fn = error_fn;
|
||||||
|
png_ptr->warning_fn = warning_fn;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* This function returns a pointer to the error_ptr associated with the user
|
||||||
|
* functions. The application should free any memory associated with this
|
||||||
|
* pointer before png_write_destroy and png_read_destroy are called.
|
||||||
|
*/
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_get_error_ptr(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr == NULL)
|
||||||
|
return NULL;
|
||||||
|
return ((png_voidp)png_ptr->error_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
|
||||||
|
void PNGAPI
|
||||||
|
png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
|
||||||
|
{
|
||||||
|
if(png_ptr != NULL)
|
||||||
|
{
|
||||||
|
png_ptr->flags &=
|
||||||
|
((~(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,955 @@
|
||||||
|
|
||||||
|
/* pngget.c - retrieval of values from info struct
|
||||||
|
*
|
||||||
|
* Last changed in libpng 1.2.15 January 5, 2007
|
||||||
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
|
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
|
||||||
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define PNG_INTERNAL
|
||||||
|
#include "png.h"
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
|
||||||
|
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
return(info_ptr->valid & flag);
|
||||||
|
else
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
return(info_ptr->rowbytes);
|
||||||
|
else
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_INFO_IMAGE_SUPPORTED)
|
||||||
|
png_bytepp PNGAPI
|
||||||
|
png_get_rows(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
return(info_ptr->row_pointers);
|
||||||
|
else
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef PNG_EASY_ACCESS_SUPPORTED
|
||||||
|
/* easy access to info, added in libpng-0.99 */
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_image_width(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
{
|
||||||
|
return info_ptr->width;
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_image_height(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
{
|
||||||
|
return info_ptr->height;
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_byte PNGAPI
|
||||||
|
png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
{
|
||||||
|
return info_ptr->bit_depth;
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_byte PNGAPI
|
||||||
|
png_get_color_type(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
{
|
||||||
|
return info_ptr->color_type;
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_byte PNGAPI
|
||||||
|
png_get_filter_type(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
{
|
||||||
|
return info_ptr->filter_type;
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_byte PNGAPI
|
||||||
|
png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
{
|
||||||
|
return info_ptr->interlace_type;
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_byte PNGAPI
|
||||||
|
png_get_compression_type(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
{
|
||||||
|
return info_ptr->compression_type;
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
#if defined(PNG_pHYs_SUPPORTED)
|
||||||
|
if (info_ptr->valid & PNG_INFO_pHYs)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "png_get_x_pixels_per_meter");
|
||||||
|
if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
|
||||||
|
return (0);
|
||||||
|
else return (info_ptr->x_pixels_per_unit);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
return (0);
|
||||||
|
#endif
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
#if defined(PNG_pHYs_SUPPORTED)
|
||||||
|
if (info_ptr->valid & PNG_INFO_pHYs)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "png_get_y_pixels_per_meter");
|
||||||
|
if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
|
||||||
|
return (0);
|
||||||
|
else return (info_ptr->y_pixels_per_unit);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
return (0);
|
||||||
|
#endif
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
#if defined(PNG_pHYs_SUPPORTED)
|
||||||
|
if (info_ptr->valid & PNG_INFO_pHYs)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "png_get_pixels_per_meter");
|
||||||
|
if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER ||
|
||||||
|
info_ptr->x_pixels_per_unit != info_ptr->y_pixels_per_unit)
|
||||||
|
return (0);
|
||||||
|
else return (info_ptr->x_pixels_per_unit);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
return (0);
|
||||||
|
#endif
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||||
|
float PNGAPI
|
||||||
|
png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
#if defined(PNG_pHYs_SUPPORTED)
|
||||||
|
if (info_ptr->valid & PNG_INFO_pHYs)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "png_get_aspect_ratio");
|
||||||
|
if (info_ptr->x_pixels_per_unit == 0)
|
||||||
|
return ((float)0.0);
|
||||||
|
else
|
||||||
|
return ((float)((float)info_ptr->y_pixels_per_unit
|
||||||
|
/(float)info_ptr->x_pixels_per_unit));
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
return (0.0);
|
||||||
|
#endif
|
||||||
|
return ((float)0.0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
png_int_32 PNGAPI
|
||||||
|
png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
#if defined(PNG_oFFs_SUPPORTED)
|
||||||
|
if (info_ptr->valid & PNG_INFO_oFFs)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "png_get_x_offset_microns");
|
||||||
|
if(info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
|
||||||
|
return (0);
|
||||||
|
else return (info_ptr->x_offset);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
return (0);
|
||||||
|
#endif
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_int_32 PNGAPI
|
||||||
|
png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
#if defined(PNG_oFFs_SUPPORTED)
|
||||||
|
if (info_ptr->valid & PNG_INFO_oFFs)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "png_get_y_offset_microns");
|
||||||
|
if(info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
|
||||||
|
return (0);
|
||||||
|
else return (info_ptr->y_offset);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
return (0);
|
||||||
|
#endif
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_int_32 PNGAPI
|
||||||
|
png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
#if defined(PNG_oFFs_SUPPORTED)
|
||||||
|
if (info_ptr->valid & PNG_INFO_oFFs)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "png_get_x_offset_microns");
|
||||||
|
if(info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
|
||||||
|
return (0);
|
||||||
|
else return (info_ptr->x_offset);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
return (0);
|
||||||
|
#endif
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_int_32 PNGAPI
|
||||||
|
png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
#if defined(PNG_oFFs_SUPPORTED)
|
||||||
|
if (info_ptr->valid & PNG_INFO_oFFs)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "png_get_y_offset_microns");
|
||||||
|
if(info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
|
||||||
|
return (0);
|
||||||
|
else return (info_ptr->y_offset);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
return (0);
|
||||||
|
#endif
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
return ((png_uint_32)((float)png_get_pixels_per_meter(png_ptr, info_ptr)
|
||||||
|
*.0254 +.5));
|
||||||
|
}
|
||||||
|
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_x_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
return ((png_uint_32)((float)png_get_x_pixels_per_meter(png_ptr, info_ptr)
|
||||||
|
*.0254 +.5));
|
||||||
|
}
|
||||||
|
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_y_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
return ((png_uint_32)((float)png_get_y_pixels_per_meter(png_ptr, info_ptr)
|
||||||
|
*.0254 +.5));
|
||||||
|
}
|
||||||
|
|
||||||
|
float PNGAPI
|
||||||
|
png_get_x_offset_inches(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
return ((float)png_get_x_offset_microns(png_ptr, info_ptr)
|
||||||
|
*.00003937);
|
||||||
|
}
|
||||||
|
|
||||||
|
float PNGAPI
|
||||||
|
png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
return ((float)png_get_y_offset_microns(png_ptr, info_ptr)
|
||||||
|
*.00003937);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_pHYs_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
|
||||||
|
{
|
||||||
|
png_uint_32 retval = 0;
|
||||||
|
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "pHYs");
|
||||||
|
if (res_x != NULL)
|
||||||
|
{
|
||||||
|
*res_x = info_ptr->x_pixels_per_unit;
|
||||||
|
retval |= PNG_INFO_pHYs;
|
||||||
|
}
|
||||||
|
if (res_y != NULL)
|
||||||
|
{
|
||||||
|
*res_y = info_ptr->y_pixels_per_unit;
|
||||||
|
retval |= PNG_INFO_pHYs;
|
||||||
|
}
|
||||||
|
if (unit_type != NULL)
|
||||||
|
{
|
||||||
|
*unit_type = (int)info_ptr->phys_unit_type;
|
||||||
|
retval |= PNG_INFO_pHYs;
|
||||||
|
if(*unit_type == 1)
|
||||||
|
{
|
||||||
|
if (res_x != NULL) *res_x = (png_uint_32)(*res_x * .0254 + .50);
|
||||||
|
if (res_y != NULL) *res_y = (png_uint_32)(*res_y * .0254 + .50);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return (retval);
|
||||||
|
}
|
||||||
|
#endif /* PNG_pHYs_SUPPORTED */
|
||||||
|
#endif /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
|
||||||
|
|
||||||
|
/* png_get_channels really belongs in here, too, but it's been around longer */
|
||||||
|
|
||||||
|
#endif /* PNG_EASY_ACCESS_SUPPORTED */
|
||||||
|
|
||||||
|
png_byte PNGAPI
|
||||||
|
png_get_channels(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
return(info_ptr->channels);
|
||||||
|
else
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_bytep PNGAPI
|
||||||
|
png_get_signature(png_structp png_ptr, png_infop info_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL)
|
||||||
|
return(info_ptr->signature);
|
||||||
|
else
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_bKGD_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_bKGD(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_color_16p *background)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
|
||||||
|
&& background != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "bKGD");
|
||||||
|
*background = &(info_ptr->background);
|
||||||
|
return (PNG_INFO_bKGD);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_cHRM_SUPPORTED)
|
||||||
|
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_cHRM(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
double *white_x, double *white_y, double *red_x, double *red_y,
|
||||||
|
double *green_x, double *green_y, double *blue_x, double *blue_y)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "cHRM");
|
||||||
|
if (white_x != NULL)
|
||||||
|
*white_x = (double)info_ptr->x_white;
|
||||||
|
if (white_y != NULL)
|
||||||
|
*white_y = (double)info_ptr->y_white;
|
||||||
|
if (red_x != NULL)
|
||||||
|
*red_x = (double)info_ptr->x_red;
|
||||||
|
if (red_y != NULL)
|
||||||
|
*red_y = (double)info_ptr->y_red;
|
||||||
|
if (green_x != NULL)
|
||||||
|
*green_x = (double)info_ptr->x_green;
|
||||||
|
if (green_y != NULL)
|
||||||
|
*green_y = (double)info_ptr->y_green;
|
||||||
|
if (blue_x != NULL)
|
||||||
|
*blue_x = (double)info_ptr->x_blue;
|
||||||
|
if (blue_y != NULL)
|
||||||
|
*blue_y = (double)info_ptr->y_blue;
|
||||||
|
return (PNG_INFO_cHRM);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#ifdef PNG_FIXED_POINT_SUPPORTED
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
|
||||||
|
png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
|
||||||
|
png_fixed_point *blue_x, png_fixed_point *blue_y)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "cHRM");
|
||||||
|
if (white_x != NULL)
|
||||||
|
*white_x = info_ptr->int_x_white;
|
||||||
|
if (white_y != NULL)
|
||||||
|
*white_y = info_ptr->int_y_white;
|
||||||
|
if (red_x != NULL)
|
||||||
|
*red_x = info_ptr->int_x_red;
|
||||||
|
if (red_y != NULL)
|
||||||
|
*red_y = info_ptr->int_y_red;
|
||||||
|
if (green_x != NULL)
|
||||||
|
*green_x = info_ptr->int_x_green;
|
||||||
|
if (green_y != NULL)
|
||||||
|
*green_y = info_ptr->int_y_green;
|
||||||
|
if (blue_x != NULL)
|
||||||
|
*blue_x = info_ptr->int_x_blue;
|
||||||
|
if (blue_y != NULL)
|
||||||
|
*blue_y = info_ptr->int_y_blue;
|
||||||
|
return (PNG_INFO_cHRM);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_gAMA_SUPPORTED)
|
||||||
|
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
|
||||||
|
&& file_gamma != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "gAMA");
|
||||||
|
*file_gamma = (double)info_ptr->gamma;
|
||||||
|
return (PNG_INFO_gAMA);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#ifdef PNG_FIXED_POINT_SUPPORTED
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_gAMA_fixed(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_fixed_point *int_file_gamma)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
|
||||||
|
&& int_file_gamma != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "gAMA");
|
||||||
|
*int_file_gamma = info_ptr->int_gamma;
|
||||||
|
return (PNG_INFO_gAMA);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_sRGB_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
|
||||||
|
&& file_srgb_intent != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "sRGB");
|
||||||
|
*file_srgb_intent = (int)info_ptr->srgb_intent;
|
||||||
|
return (PNG_INFO_sRGB);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_iCCP_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_iCCP(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_charpp name, int *compression_type,
|
||||||
|
png_charpp profile, png_uint_32 *proflen)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)
|
||||||
|
&& name != NULL && profile != NULL && proflen != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "iCCP");
|
||||||
|
*name = info_ptr->iccp_name;
|
||||||
|
*profile = info_ptr->iccp_profile;
|
||||||
|
/* compression_type is a dummy so the API won't have to change
|
||||||
|
if we introduce multiple compression types later. */
|
||||||
|
*proflen = (int)info_ptr->iccp_proflen;
|
||||||
|
*compression_type = (int)info_ptr->iccp_compression;
|
||||||
|
return (PNG_INFO_iCCP);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_sPLT_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_sPLT(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_sPLT_tpp spalettes)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
|
||||||
|
*spalettes = info_ptr->splt_palettes;
|
||||||
|
return ((png_uint_32)info_ptr->splt_palettes_num);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_hIST_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p *hist)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
|
||||||
|
&& hist != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "hIST");
|
||||||
|
*hist = info_ptr->hist;
|
||||||
|
return (PNG_INFO_hIST);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_uint_32 *width, png_uint_32 *height, int *bit_depth,
|
||||||
|
int *color_type, int *interlace_type, int *compression_type,
|
||||||
|
int *filter_type)
|
||||||
|
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && width != NULL && height != NULL &&
|
||||||
|
bit_depth != NULL && color_type != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "IHDR");
|
||||||
|
*width = info_ptr->width;
|
||||||
|
*height = info_ptr->height;
|
||||||
|
*bit_depth = info_ptr->bit_depth;
|
||||||
|
if (info_ptr->bit_depth < 1 || info_ptr->bit_depth > 16)
|
||||||
|
png_error(png_ptr, "Invalid bit depth");
|
||||||
|
*color_type = info_ptr->color_type;
|
||||||
|
if (info_ptr->color_type > 6)
|
||||||
|
png_error(png_ptr, "Invalid color type");
|
||||||
|
if (compression_type != NULL)
|
||||||
|
*compression_type = info_ptr->compression_type;
|
||||||
|
if (filter_type != NULL)
|
||||||
|
*filter_type = info_ptr->filter_type;
|
||||||
|
if (interlace_type != NULL)
|
||||||
|
*interlace_type = info_ptr->interlace_type;
|
||||||
|
|
||||||
|
/* check for potential overflow of rowbytes */
|
||||||
|
if (*width == 0 || *width > PNG_UINT_31_MAX)
|
||||||
|
png_error(png_ptr, "Invalid image width");
|
||||||
|
if (*height == 0 || *height > PNG_UINT_31_MAX)
|
||||||
|
png_error(png_ptr, "Invalid image height");
|
||||||
|
if (info_ptr->width > (PNG_UINT_32_MAX
|
||||||
|
>> 3) /* 8-byte RGBA pixels */
|
||||||
|
- 64 /* bigrowbuf hack */
|
||||||
|
- 1 /* filter byte */
|
||||||
|
- 7*8 /* rounding of width to multiple of 8 pixels */
|
||||||
|
- 8) /* extra max_pixel_depth pad */
|
||||||
|
{
|
||||||
|
png_warning(png_ptr,
|
||||||
|
"Width too large for libpng to process image data.");
|
||||||
|
}
|
||||||
|
return (1);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_oFFs_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_oFFs(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
|
||||||
|
&& offset_x != NULL && offset_y != NULL && unit_type != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "oFFs");
|
||||||
|
*offset_x = info_ptr->x_offset;
|
||||||
|
*offset_y = info_ptr->y_offset;
|
||||||
|
*unit_type = (int)info_ptr->offset_unit_type;
|
||||||
|
return (PNG_INFO_oFFs);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_pCAL_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_pCAL(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
|
||||||
|
png_charp *units, png_charpp *params)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)
|
||||||
|
&& purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
|
||||||
|
nparams != NULL && units != NULL && params != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "pCAL");
|
||||||
|
*purpose = info_ptr->pcal_purpose;
|
||||||
|
*X0 = info_ptr->pcal_X0;
|
||||||
|
*X1 = info_ptr->pcal_X1;
|
||||||
|
*type = (int)info_ptr->pcal_type;
|
||||||
|
*nparams = (int)info_ptr->pcal_nparams;
|
||||||
|
*units = info_ptr->pcal_units;
|
||||||
|
*params = info_ptr->pcal_params;
|
||||||
|
return (PNG_INFO_pCAL);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_sCAL_SUPPORTED)
|
||||||
|
#ifdef PNG_FLOATING_POINT_SUPPORTED
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_sCAL(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
int *unit, double *width, double *height)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL &&
|
||||||
|
(info_ptr->valid & PNG_INFO_sCAL))
|
||||||
|
{
|
||||||
|
*unit = info_ptr->scal_unit;
|
||||||
|
*width = info_ptr->scal_pixel_width;
|
||||||
|
*height = info_ptr->scal_pixel_height;
|
||||||
|
return (PNG_INFO_sCAL);
|
||||||
|
}
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#ifdef PNG_FIXED_POINT_SUPPORTED
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_sCAL_s(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
int *unit, png_charpp width, png_charpp height)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL &&
|
||||||
|
(info_ptr->valid & PNG_INFO_sCAL))
|
||||||
|
{
|
||||||
|
*unit = info_ptr->scal_unit;
|
||||||
|
*width = info_ptr->scal_s_width;
|
||||||
|
*height = info_ptr->scal_s_height;
|
||||||
|
return (PNG_INFO_sCAL);
|
||||||
|
}
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_pHYs_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_pHYs(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
|
||||||
|
{
|
||||||
|
png_uint_32 retval = 0;
|
||||||
|
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL &&
|
||||||
|
(info_ptr->valid & PNG_INFO_pHYs))
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "pHYs");
|
||||||
|
if (res_x != NULL)
|
||||||
|
{
|
||||||
|
*res_x = info_ptr->x_pixels_per_unit;
|
||||||
|
retval |= PNG_INFO_pHYs;
|
||||||
|
}
|
||||||
|
if (res_y != NULL)
|
||||||
|
{
|
||||||
|
*res_y = info_ptr->y_pixels_per_unit;
|
||||||
|
retval |= PNG_INFO_pHYs;
|
||||||
|
}
|
||||||
|
if (unit_type != NULL)
|
||||||
|
{
|
||||||
|
*unit_type = (int)info_ptr->phys_unit_type;
|
||||||
|
retval |= PNG_INFO_pHYs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return (retval);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,
|
||||||
|
int *num_palette)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)
|
||||||
|
&& palette != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "PLTE");
|
||||||
|
*palette = info_ptr->palette;
|
||||||
|
*num_palette = info_ptr->num_palette;
|
||||||
|
png_debug1(3, "num_palette = %d\n", *num_palette);
|
||||||
|
return (PNG_INFO_PLTE);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_sBIT_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)
|
||||||
|
&& sig_bit != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "sBIT");
|
||||||
|
*sig_bit = &(info_ptr->sig_bit);
|
||||||
|
return (PNG_INFO_sBIT);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_TEXT_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,
|
||||||
|
int *num_text)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n",
|
||||||
|
(png_ptr->chunk_name[0] == '\0' ? "text"
|
||||||
|
: (png_const_charp)png_ptr->chunk_name));
|
||||||
|
if (text_ptr != NULL)
|
||||||
|
*text_ptr = info_ptr->text;
|
||||||
|
if (num_text != NULL)
|
||||||
|
*num_text = info_ptr->num_text;
|
||||||
|
return ((png_uint_32)info_ptr->num_text);
|
||||||
|
}
|
||||||
|
if (num_text != NULL)
|
||||||
|
*num_text = 0;
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_tIME_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)
|
||||||
|
&& mod_time != NULL)
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "tIME");
|
||||||
|
*mod_time = &(info_ptr->mod_time);
|
||||||
|
return (PNG_INFO_tIME);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_tRNS_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_tRNS(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_bytep *trans, int *num_trans, png_color_16p *trans_values)
|
||||||
|
{
|
||||||
|
png_uint_32 retval = 0;
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
|
||||||
|
{
|
||||||
|
png_debug1(1, "in %s retrieval function\n", "tRNS");
|
||||||
|
if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
||||||
|
{
|
||||||
|
if (trans != NULL)
|
||||||
|
{
|
||||||
|
*trans = info_ptr->trans;
|
||||||
|
retval |= PNG_INFO_tRNS;
|
||||||
|
}
|
||||||
|
if (trans_values != NULL)
|
||||||
|
*trans_values = &(info_ptr->trans_values);
|
||||||
|
}
|
||||||
|
else /* if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) */
|
||||||
|
{
|
||||||
|
if (trans_values != NULL)
|
||||||
|
{
|
||||||
|
*trans_values = &(info_ptr->trans_values);
|
||||||
|
retval |= PNG_INFO_tRNS;
|
||||||
|
}
|
||||||
|
if(trans != NULL)
|
||||||
|
*trans = NULL;
|
||||||
|
}
|
||||||
|
if(num_trans != NULL)
|
||||||
|
{
|
||||||
|
*num_trans = info_ptr->num_trans;
|
||||||
|
retval |= PNG_INFO_tRNS;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return (retval);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
|
||||||
|
png_unknown_chunkpp unknowns)
|
||||||
|
{
|
||||||
|
if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
|
||||||
|
*unknowns = info_ptr->unknown_chunks;
|
||||||
|
return ((png_uint_32)info_ptr->unknown_chunks_num);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
|
||||||
|
png_byte PNGAPI
|
||||||
|
png_get_rgb_to_gray_status (png_structp png_ptr)
|
||||||
|
{
|
||||||
|
return (png_byte)(png_ptr? png_ptr->rgb_to_gray_status : 0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_USER_CHUNKS_SUPPORTED)
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_get_user_chunk_ptr(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
return (png_ptr? png_ptr->user_chunk_ptr : NULL);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef PNG_WRITE_SUPPORTED
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_compression_buffer_size(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
return (png_uint_32)(png_ptr? png_ptr->zbuf_size : 0L);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
|
||||||
|
#ifndef PNG_1_0_X
|
||||||
|
/* this function was added to libpng 1.2.0 and should exist by default */
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_asm_flags (png_structp png_ptr)
|
||||||
|
{
|
||||||
|
#ifdef PNG_MMX_CODE_SUPPORTED
|
||||||
|
return (png_uint_32)(png_ptr? png_ptr->asm_flags : 0L);
|
||||||
|
#else
|
||||||
|
return (png_ptr? 0L: 0L);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/* this function was added to libpng 1.2.0 and should exist by default */
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_asm_flagmask (int flag_select)
|
||||||
|
{
|
||||||
|
#ifdef PNG_MMX_CODE_SUPPORTED
|
||||||
|
png_uint_32 settable_asm_flags = 0;
|
||||||
|
|
||||||
|
if (flag_select & PNG_SELECT_READ)
|
||||||
|
settable_asm_flags |=
|
||||||
|
PNG_ASM_FLAG_MMX_READ_COMBINE_ROW |
|
||||||
|
PNG_ASM_FLAG_MMX_READ_INTERLACE |
|
||||||
|
PNG_ASM_FLAG_MMX_READ_FILTER_SUB |
|
||||||
|
PNG_ASM_FLAG_MMX_READ_FILTER_UP |
|
||||||
|
PNG_ASM_FLAG_MMX_READ_FILTER_AVG |
|
||||||
|
PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ;
|
||||||
|
/* no non-MMX flags yet */
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* GRR: no write-flags yet, either, but someday... */
|
||||||
|
if (flag_select & PNG_SELECT_WRITE)
|
||||||
|
settable_asm_flags |=
|
||||||
|
PNG_ASM_FLAG_MMX_WRITE_ [whatever] ;
|
||||||
|
#endif /* 0 */
|
||||||
|
|
||||||
|
return settable_asm_flags; /* _theoretically_ settable capabilities only */
|
||||||
|
#else
|
||||||
|
return (0L);
|
||||||
|
#endif /* PNG_MMX_CODE_SUPPORTED */
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* GRR: could add this: && defined(PNG_MMX_CODE_SUPPORTED) */
|
||||||
|
/* this function was added to libpng 1.2.0 */
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_mmx_flagmask (int flag_select, int *compilerID)
|
||||||
|
{
|
||||||
|
#if defined(PNG_MMX_CODE_SUPPORTED)
|
||||||
|
png_uint_32 settable_mmx_flags = 0;
|
||||||
|
|
||||||
|
if (flag_select & PNG_SELECT_READ)
|
||||||
|
settable_mmx_flags |=
|
||||||
|
PNG_ASM_FLAG_MMX_READ_COMBINE_ROW |
|
||||||
|
PNG_ASM_FLAG_MMX_READ_INTERLACE |
|
||||||
|
PNG_ASM_FLAG_MMX_READ_FILTER_SUB |
|
||||||
|
PNG_ASM_FLAG_MMX_READ_FILTER_UP |
|
||||||
|
PNG_ASM_FLAG_MMX_READ_FILTER_AVG |
|
||||||
|
PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ;
|
||||||
|
#if 0
|
||||||
|
/* GRR: no MMX write support yet, but someday... */
|
||||||
|
if (flag_select & PNG_SELECT_WRITE)
|
||||||
|
settable_mmx_flags |=
|
||||||
|
PNG_ASM_FLAG_MMX_WRITE_ [whatever] ;
|
||||||
|
#endif /* 0 */
|
||||||
|
|
||||||
|
if (compilerID != NULL) {
|
||||||
|
#ifdef PNG_USE_PNGVCRD
|
||||||
|
*compilerID = 1; /* MSVC */
|
||||||
|
#else
|
||||||
|
#ifdef PNG_USE_PNGGCCRD
|
||||||
|
*compilerID = 2; /* gcc/gas */
|
||||||
|
#else
|
||||||
|
*compilerID = -1; /* unknown (i.e., no asm/MMX code compiled) */
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
return settable_mmx_flags; /* _theoretically_ settable capabilities only */
|
||||||
|
#else
|
||||||
|
return (0L);
|
||||||
|
#endif /* ?PNG_MMX_CODE_SUPPORTED */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* this function was added to libpng 1.2.0 */
|
||||||
|
png_byte PNGAPI
|
||||||
|
png_get_mmx_bitdepth_threshold (png_structp png_ptr)
|
||||||
|
{
|
||||||
|
#if defined(PNG_MMX_CODE_SUPPORTED)
|
||||||
|
return (png_byte)(png_ptr? png_ptr->mmx_bitdepth_threshold : 0);
|
||||||
|
#else
|
||||||
|
return (png_ptr? 0: 0);
|
||||||
|
#endif /* ?PNG_MMX_CODE_SUPPORTED */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* this function was added to libpng 1.2.0 */
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_mmx_rowbytes_threshold (png_structp png_ptr)
|
||||||
|
{
|
||||||
|
#if defined(PNG_MMX_CODE_SUPPORTED)
|
||||||
|
return (png_uint_32)(png_ptr? png_ptr->mmx_rowbytes_threshold : 0L);
|
||||||
|
#else
|
||||||
|
return (png_ptr? 0L: 0L);
|
||||||
|
#endif /* ?PNG_MMX_CODE_SUPPORTED */
|
||||||
|
}
|
||||||
|
#endif /* ?PNG_1_0_X */
|
||||||
|
#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
|
||||||
|
|
||||||
|
#ifdef PNG_SET_USER_LIMITS_SUPPORTED
|
||||||
|
/* these functions were added to libpng 1.2.6 */
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_user_width_max (png_structp png_ptr)
|
||||||
|
{
|
||||||
|
return (png_ptr? png_ptr->user_width_max : 0);
|
||||||
|
}
|
||||||
|
png_uint_32 PNGAPI
|
||||||
|
png_get_user_height_max (png_structp png_ptr)
|
||||||
|
{
|
||||||
|
return (png_ptr? png_ptr->user_height_max : 0);
|
||||||
|
}
|
||||||
|
#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
|
||||||
|
|
||||||
|
#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
|
||||||
|
|
@ -0,0 +1,608 @@
|
||||||
|
|
||||||
|
/* pngmem.c - stub functions for memory allocation
|
||||||
|
*
|
||||||
|
* Last changed in libpng 1.2.13 November 13, 2006
|
||||||
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
|
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
|
||||||
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
|
*
|
||||||
|
* This file provides a location for all memory allocation. Users who
|
||||||
|
* need special memory handling are expected to supply replacement
|
||||||
|
* functions for png_malloc() and png_free(), and to use
|
||||||
|
* png_create_read_struct_2() and png_create_write_struct_2() to
|
||||||
|
* identify the replacement functions.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define PNG_INTERNAL
|
||||||
|
#include "png.h"
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
|
||||||
|
|
||||||
|
/* Borland DOS special memory handler */
|
||||||
|
#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
|
||||||
|
/* if you change this, be sure to change the one in png.h also */
|
||||||
|
|
||||||
|
/* Allocate memory for a png_struct. The malloc and memset can be replaced
|
||||||
|
by a single call to calloc() if this is thought to improve performance. */
|
||||||
|
png_voidp /* PRIVATE */
|
||||||
|
png_create_struct(int type)
|
||||||
|
{
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Alternate version of png_create_struct, for use with user-defined malloc. */
|
||||||
|
png_voidp /* PRIVATE */
|
||||||
|
png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
|
||||||
|
{
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
png_size_t size;
|
||||||
|
png_voidp struct_ptr;
|
||||||
|
|
||||||
|
if (type == PNG_STRUCT_INFO)
|
||||||
|
size = png_sizeof(png_info);
|
||||||
|
else if (type == PNG_STRUCT_PNG)
|
||||||
|
size = png_sizeof(png_struct);
|
||||||
|
else
|
||||||
|
return (png_get_copyright(NULL));
|
||||||
|
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
if(malloc_fn != NULL)
|
||||||
|
{
|
||||||
|
png_struct dummy_struct;
|
||||||
|
png_structp png_ptr = &dummy_struct;
|
||||||
|
png_ptr->mem_ptr=mem_ptr;
|
||||||
|
struct_ptr = (*(malloc_fn))(png_ptr, (png_uint_32)size);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
struct_ptr = (png_voidp)farmalloc(size);
|
||||||
|
if (struct_ptr != NULL)
|
||||||
|
png_memset(struct_ptr, 0, size);
|
||||||
|
return (struct_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Free memory allocated by a png_create_struct() call */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_destroy_struct(png_voidp struct_ptr)
|
||||||
|
{
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Free memory allocated by a png_create_struct() call */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
|
||||||
|
png_voidp mem_ptr)
|
||||||
|
{
|
||||||
|
#endif
|
||||||
|
if (struct_ptr != NULL)
|
||||||
|
{
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
if(free_fn != NULL)
|
||||||
|
{
|
||||||
|
png_struct dummy_struct;
|
||||||
|
png_structp png_ptr = &dummy_struct;
|
||||||
|
png_ptr->mem_ptr=mem_ptr;
|
||||||
|
(*(free_fn))(png_ptr, struct_ptr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
farfree (struct_ptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Allocate memory. For reasonable files, size should never exceed
|
||||||
|
* 64K. However, zlib may allocate more then 64K if you don't tell
|
||||||
|
* it not to. See zconf.h and png.h for more information. zlib does
|
||||||
|
* need to allocate exactly 64K, so whatever you call here must
|
||||||
|
* have the ability to do that.
|
||||||
|
*
|
||||||
|
* Borland seems to have a problem in DOS mode for exactly 64K.
|
||||||
|
* It gives you a segment with an offset of 8 (perhaps to store its
|
||||||
|
* memory stuff). zlib doesn't like this at all, so we have to
|
||||||
|
* detect and deal with it. This code should not be needed in
|
||||||
|
* Windows or OS/2 modes, and only in 16 bit mode. This code has
|
||||||
|
* been updated by Alexander Lehmann for version 0.89 to waste less
|
||||||
|
* memory.
|
||||||
|
*
|
||||||
|
* Note that we can't use png_size_t for the "size" declaration,
|
||||||
|
* since on some systems a png_size_t is a 16-bit quantity, and as a
|
||||||
|
* result, we would be truncating potentially larger memory requests
|
||||||
|
* (which should cause a fatal error) and introducing major problems.
|
||||||
|
*/
|
||||||
|
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_malloc(png_structp png_ptr, png_uint_32 size)
|
||||||
|
{
|
||||||
|
png_voidp ret;
|
||||||
|
|
||||||
|
if (png_ptr == NULL || size == 0)
|
||||||
|
return (NULL);
|
||||||
|
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
if(png_ptr->malloc_fn != NULL)
|
||||||
|
ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
|
||||||
|
else
|
||||||
|
ret = (png_malloc_default(png_ptr, size));
|
||||||
|
if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
|
||||||
|
png_error(png_ptr, "Out of memory!");
|
||||||
|
return (ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_malloc_default(png_structp png_ptr, png_uint_32 size)
|
||||||
|
{
|
||||||
|
png_voidp ret;
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
|
||||||
|
if (png_ptr == NULL || size == 0)
|
||||||
|
return (NULL);
|
||||||
|
|
||||||
|
#ifdef PNG_MAX_MALLOC_64K
|
||||||
|
if (size > (png_uint_32)65536L)
|
||||||
|
{
|
||||||
|
png_warning(png_ptr, "Cannot Allocate > 64K");
|
||||||
|
ret = NULL;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (size != (size_t)size)
|
||||||
|
ret = NULL;
|
||||||
|
else if (size == (png_uint_32)65536L)
|
||||||
|
{
|
||||||
|
if (png_ptr->offset_table == NULL)
|
||||||
|
{
|
||||||
|
/* try to see if we need to do any of this fancy stuff */
|
||||||
|
ret = farmalloc(size);
|
||||||
|
if (ret == NULL || ((png_size_t)ret & 0xffff))
|
||||||
|
{
|
||||||
|
int num_blocks;
|
||||||
|
png_uint_32 total_size;
|
||||||
|
png_bytep table;
|
||||||
|
int i;
|
||||||
|
png_byte huge * hptr;
|
||||||
|
|
||||||
|
if (ret != NULL)
|
||||||
|
{
|
||||||
|
farfree(ret);
|
||||||
|
ret = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(png_ptr->zlib_window_bits > 14)
|
||||||
|
num_blocks = (int)(1 << (png_ptr->zlib_window_bits - 14));
|
||||||
|
else
|
||||||
|
num_blocks = 1;
|
||||||
|
if (png_ptr->zlib_mem_level >= 7)
|
||||||
|
num_blocks += (int)(1 << (png_ptr->zlib_mem_level - 7));
|
||||||
|
else
|
||||||
|
num_blocks++;
|
||||||
|
|
||||||
|
total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
|
||||||
|
|
||||||
|
table = farmalloc(total_size);
|
||||||
|
|
||||||
|
if (table == NULL)
|
||||||
|
{
|
||||||
|
#ifndef PNG_USER_MEM_SUPPORTED
|
||||||
|
if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
|
||||||
|
png_error(png_ptr, "Out Of Memory."); /* Note "O" and "M" */
|
||||||
|
else
|
||||||
|
png_warning(png_ptr, "Out Of Memory.");
|
||||||
|
#endif
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((png_size_t)table & 0xfff0)
|
||||||
|
{
|
||||||
|
#ifndef PNG_USER_MEM_SUPPORTED
|
||||||
|
if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
|
||||||
|
png_error(png_ptr,
|
||||||
|
"Farmalloc didn't return normalized pointer");
|
||||||
|
else
|
||||||
|
png_warning(png_ptr,
|
||||||
|
"Farmalloc didn't return normalized pointer");
|
||||||
|
#endif
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_ptr->offset_table = table;
|
||||||
|
png_ptr->offset_table_ptr = farmalloc(num_blocks *
|
||||||
|
png_sizeof (png_bytep));
|
||||||
|
|
||||||
|
if (png_ptr->offset_table_ptr == NULL)
|
||||||
|
{
|
||||||
|
#ifndef PNG_USER_MEM_SUPPORTED
|
||||||
|
if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
|
||||||
|
png_error(png_ptr, "Out Of memory."); /* Note "O" and "M" */
|
||||||
|
else
|
||||||
|
png_warning(png_ptr, "Out Of memory.");
|
||||||
|
#endif
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
hptr = (png_byte huge *)table;
|
||||||
|
if ((png_size_t)hptr & 0xf)
|
||||||
|
{
|
||||||
|
hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
|
||||||
|
hptr = hptr + 16L; /* "hptr += 16L" fails on Turbo C++ 3.0 */
|
||||||
|
}
|
||||||
|
for (i = 0; i < num_blocks; i++)
|
||||||
|
{
|
||||||
|
png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
|
||||||
|
hptr = hptr + (png_uint_32)65536L; /* "+=" fails on TC++3.0 */
|
||||||
|
}
|
||||||
|
|
||||||
|
png_ptr->offset_table_number = num_blocks;
|
||||||
|
png_ptr->offset_table_count = 0;
|
||||||
|
png_ptr->offset_table_count_free = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
|
||||||
|
{
|
||||||
|
#ifndef PNG_USER_MEM_SUPPORTED
|
||||||
|
if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
|
||||||
|
png_error(png_ptr, "Out of Memory."); /* Note "o" and "M" */
|
||||||
|
else
|
||||||
|
png_warning(png_ptr, "Out of Memory.");
|
||||||
|
#endif
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
ret = farmalloc(size);
|
||||||
|
|
||||||
|
#ifndef PNG_USER_MEM_SUPPORTED
|
||||||
|
if (ret == NULL)
|
||||||
|
{
|
||||||
|
if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
|
||||||
|
png_error(png_ptr, "Out of memory."); /* Note "o" and "m" */
|
||||||
|
else
|
||||||
|
png_warning(png_ptr, "Out of memory."); /* Note "o" and "m" */
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return (ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* free a pointer allocated by png_malloc(). In the default
|
||||||
|
configuration, png_ptr is not used, but is passed in case it
|
||||||
|
is needed. If ptr is NULL, return without taking any action. */
|
||||||
|
void PNGAPI
|
||||||
|
png_free(png_structp png_ptr, png_voidp ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr == NULL || ptr == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
if (png_ptr->free_fn != NULL)
|
||||||
|
{
|
||||||
|
(*(png_ptr->free_fn))(png_ptr, ptr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else png_free_default(png_ptr, ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PNGAPI
|
||||||
|
png_free_default(png_structp png_ptr, png_voidp ptr)
|
||||||
|
{
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
|
||||||
|
if (png_ptr->offset_table != NULL)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < png_ptr->offset_table_count; i++)
|
||||||
|
{
|
||||||
|
if (ptr == png_ptr->offset_table_ptr[i])
|
||||||
|
{
|
||||||
|
ptr = NULL;
|
||||||
|
png_ptr->offset_table_count_free++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
|
||||||
|
{
|
||||||
|
farfree(png_ptr->offset_table);
|
||||||
|
farfree(png_ptr->offset_table_ptr);
|
||||||
|
png_ptr->offset_table = NULL;
|
||||||
|
png_ptr->offset_table_ptr = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ptr != NULL)
|
||||||
|
{
|
||||||
|
farfree(ptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#else /* Not the Borland DOS special memory handler */
|
||||||
|
|
||||||
|
/* Allocate memory for a png_struct or a png_info. The malloc and
|
||||||
|
memset can be replaced by a single call to calloc() if this is thought
|
||||||
|
to improve performance noticably. */
|
||||||
|
png_voidp /* PRIVATE */
|
||||||
|
png_create_struct(int type)
|
||||||
|
{
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Allocate memory for a png_struct or a png_info. The malloc and
|
||||||
|
memset can be replaced by a single call to calloc() if this is thought
|
||||||
|
to improve performance noticably. */
|
||||||
|
png_voidp /* PRIVATE */
|
||||||
|
png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
|
||||||
|
{
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
png_size_t size;
|
||||||
|
png_voidp struct_ptr;
|
||||||
|
|
||||||
|
if (type == PNG_STRUCT_INFO)
|
||||||
|
size = png_sizeof(png_info);
|
||||||
|
else if (type == PNG_STRUCT_PNG)
|
||||||
|
size = png_sizeof(png_struct);
|
||||||
|
else
|
||||||
|
return (NULL);
|
||||||
|
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
if(malloc_fn != NULL)
|
||||||
|
{
|
||||||
|
png_struct dummy_struct;
|
||||||
|
png_structp png_ptr = &dummy_struct;
|
||||||
|
png_ptr->mem_ptr=mem_ptr;
|
||||||
|
struct_ptr = (*(malloc_fn))(png_ptr, size);
|
||||||
|
if (struct_ptr != NULL)
|
||||||
|
png_memset(struct_ptr, 0, size);
|
||||||
|
return (struct_ptr);
|
||||||
|
}
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
|
||||||
|
#if defined(__TURBOC__) && !defined(__FLAT__)
|
||||||
|
struct_ptr = (png_voidp)farmalloc(size);
|
||||||
|
#else
|
||||||
|
# if defined(_MSC_VER) && defined(MAXSEG_64K)
|
||||||
|
struct_ptr = (png_voidp)halloc(size,1);
|
||||||
|
# else
|
||||||
|
struct_ptr = (png_voidp)malloc(size);
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
if (struct_ptr != NULL)
|
||||||
|
png_memset(struct_ptr, 0, size);
|
||||||
|
|
||||||
|
return (struct_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Free memory allocated by a png_create_struct() call */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_destroy_struct(png_voidp struct_ptr)
|
||||||
|
{
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Free memory allocated by a png_create_struct() call */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
|
||||||
|
png_voidp mem_ptr)
|
||||||
|
{
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
if (struct_ptr != NULL)
|
||||||
|
{
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
if(free_fn != NULL)
|
||||||
|
{
|
||||||
|
png_struct dummy_struct;
|
||||||
|
png_structp png_ptr = &dummy_struct;
|
||||||
|
png_ptr->mem_ptr=mem_ptr;
|
||||||
|
(*(free_fn))(png_ptr, struct_ptr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
#if defined(__TURBOC__) && !defined(__FLAT__)
|
||||||
|
farfree(struct_ptr);
|
||||||
|
#else
|
||||||
|
# if defined(_MSC_VER) && defined(MAXSEG_64K)
|
||||||
|
hfree(struct_ptr);
|
||||||
|
# else
|
||||||
|
free(struct_ptr);
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Allocate memory. For reasonable files, size should never exceed
|
||||||
|
64K. However, zlib may allocate more then 64K if you don't tell
|
||||||
|
it not to. See zconf.h and png.h for more information. zlib does
|
||||||
|
need to allocate exactly 64K, so whatever you call here must
|
||||||
|
have the ability to do that. */
|
||||||
|
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_malloc(png_structp png_ptr, png_uint_32 size)
|
||||||
|
{
|
||||||
|
png_voidp ret;
|
||||||
|
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
if (png_ptr == NULL || size == 0)
|
||||||
|
return (NULL);
|
||||||
|
|
||||||
|
if(png_ptr->malloc_fn != NULL)
|
||||||
|
ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
|
||||||
|
else
|
||||||
|
ret = (png_malloc_default(png_ptr, size));
|
||||||
|
if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
|
||||||
|
png_error(png_ptr, "Out of Memory!");
|
||||||
|
return (ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_malloc_default(png_structp png_ptr, png_uint_32 size)
|
||||||
|
{
|
||||||
|
png_voidp ret;
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
|
||||||
|
if (png_ptr == NULL || size == 0)
|
||||||
|
return (NULL);
|
||||||
|
|
||||||
|
#ifdef PNG_MAX_MALLOC_64K
|
||||||
|
if (size > (png_uint_32)65536L)
|
||||||
|
{
|
||||||
|
#ifndef PNG_USER_MEM_SUPPORTED
|
||||||
|
if(png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
|
||||||
|
png_error(png_ptr, "Cannot Allocate > 64K");
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Check for overflow */
|
||||||
|
#if defined(__TURBOC__) && !defined(__FLAT__)
|
||||||
|
if (size != (unsigned long)size)
|
||||||
|
ret = NULL;
|
||||||
|
else
|
||||||
|
ret = farmalloc(size);
|
||||||
|
#else
|
||||||
|
# if defined(_MSC_VER) && defined(MAXSEG_64K)
|
||||||
|
if (size != (unsigned long)size)
|
||||||
|
ret = NULL;
|
||||||
|
else
|
||||||
|
ret = halloc(size, 1);
|
||||||
|
# else
|
||||||
|
if (size != (size_t)size)
|
||||||
|
ret = NULL;
|
||||||
|
else
|
||||||
|
ret = malloc((size_t)size);
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef PNG_USER_MEM_SUPPORTED
|
||||||
|
if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
|
||||||
|
png_error(png_ptr, "Out of Memory");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return (ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Free a pointer allocated by png_malloc(). If ptr is NULL, return
|
||||||
|
without taking any action. */
|
||||||
|
void PNGAPI
|
||||||
|
png_free(png_structp png_ptr, png_voidp ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr == NULL || ptr == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
if (png_ptr->free_fn != NULL)
|
||||||
|
{
|
||||||
|
(*(png_ptr->free_fn))(png_ptr, ptr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else png_free_default(png_ptr, ptr);
|
||||||
|
}
|
||||||
|
void PNGAPI
|
||||||
|
png_free_default(png_structp png_ptr, png_voidp ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr == NULL || ptr == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
|
||||||
|
#if defined(__TURBOC__) && !defined(__FLAT__)
|
||||||
|
farfree(ptr);
|
||||||
|
#else
|
||||||
|
# if defined(_MSC_VER) && defined(MAXSEG_64K)
|
||||||
|
hfree(ptr);
|
||||||
|
# else
|
||||||
|
free(ptr);
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* Not Borland DOS special memory handler */
|
||||||
|
|
||||||
|
#if defined(PNG_1_0_X)
|
||||||
|
# define png_malloc_warn png_malloc
|
||||||
|
#else
|
||||||
|
/* This function was added at libpng version 1.2.3. The png_malloc_warn()
|
||||||
|
* function will set up png_malloc() to issue a png_warning and return NULL
|
||||||
|
* instead of issuing a png_error, if it fails to allocate the requested
|
||||||
|
* memory.
|
||||||
|
*/
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_malloc_warn(png_structp png_ptr, png_uint_32 size)
|
||||||
|
{
|
||||||
|
png_voidp ptr;
|
||||||
|
png_uint_32 save_flags;
|
||||||
|
if(png_ptr == NULL) return (NULL);
|
||||||
|
|
||||||
|
save_flags=png_ptr->flags;
|
||||||
|
png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
|
||||||
|
ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
|
||||||
|
png_ptr->flags=save_flags;
|
||||||
|
return(ptr);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_memcpy_check (png_structp png_ptr, png_voidp s1, png_voidp s2,
|
||||||
|
png_uint_32 length)
|
||||||
|
{
|
||||||
|
png_size_t size;
|
||||||
|
|
||||||
|
size = (png_size_t)length;
|
||||||
|
if ((png_uint_32)size != length)
|
||||||
|
png_error(png_ptr,"Overflow in png_memcpy_check.");
|
||||||
|
|
||||||
|
return(png_memcpy (s1, s2, size));
|
||||||
|
}
|
||||||
|
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_memset_check (png_structp png_ptr, png_voidp s1, int value,
|
||||||
|
png_uint_32 length)
|
||||||
|
{
|
||||||
|
png_size_t size;
|
||||||
|
|
||||||
|
size = (png_size_t)length;
|
||||||
|
if ((png_uint_32)size != length)
|
||||||
|
png_error(png_ptr,"Overflow in png_memset_check.");
|
||||||
|
|
||||||
|
return (png_memset (s1, value, size));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef PNG_USER_MEM_SUPPORTED
|
||||||
|
/* This function is called when the application wants to use another method
|
||||||
|
* of allocating and freeing memory.
|
||||||
|
*/
|
||||||
|
void PNGAPI
|
||||||
|
png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
|
||||||
|
malloc_fn, png_free_ptr free_fn)
|
||||||
|
{
|
||||||
|
if(png_ptr != NULL) {
|
||||||
|
png_ptr->mem_ptr = mem_ptr;
|
||||||
|
png_ptr->malloc_fn = malloc_fn;
|
||||||
|
png_ptr->free_fn = free_fn;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This function returns a pointer to the mem_ptr associated with the user
|
||||||
|
* functions. The application should free any memory associated with this
|
||||||
|
* pointer before png_write_destroy and png_read_destroy are called.
|
||||||
|
*/
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_get_mem_ptr(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
if(png_ptr == NULL) return (NULL);
|
||||||
|
return ((png_voidp)png_ptr->mem_ptr);
|
||||||
|
}
|
||||||
|
#endif /* PNG_USER_MEM_SUPPORTED */
|
||||||
|
#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,167 @@
|
||||||
|
|
||||||
|
/* pngrio.c - functions for data input
|
||||||
|
*
|
||||||
|
* Last changed in libpng 1.2.13 November 13, 2006
|
||||||
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
|
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
|
||||||
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
|
*
|
||||||
|
* This file provides a location for all input. Users who need
|
||||||
|
* special handling are expected to write a function that has the same
|
||||||
|
* arguments as this and performs a similar function, but that possibly
|
||||||
|
* has a different input method. Note that you shouldn't change this
|
||||||
|
* function, but rather write a replacement function and then make
|
||||||
|
* libpng use it at run time with png_set_read_fn(...).
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define PNG_INTERNAL
|
||||||
|
#include "png.h"
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SUPPORTED)
|
||||||
|
|
||||||
|
/* Read the data from whatever input you are using. The default routine
|
||||||
|
reads from a file pointer. Note that this routine sometimes gets called
|
||||||
|
with very small lengths, so you should implement some kind of simple
|
||||||
|
buffering if you are using unbuffered reads. This should never be asked
|
||||||
|
to read more then 64K on a 16 bit machine. */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
||||||
|
{
|
||||||
|
png_debug1(4,"reading %d bytes\n", (int)length);
|
||||||
|
if (png_ptr->read_data_fn != NULL)
|
||||||
|
(*(png_ptr->read_data_fn))(png_ptr, data, length);
|
||||||
|
else
|
||||||
|
png_error(png_ptr, "Call to NULL read function");
|
||||||
|
}
|
||||||
|
|
||||||
|
#if !defined(PNG_NO_STDIO)
|
||||||
|
/* This is the function that does the actual reading of data. If you are
|
||||||
|
not reading from a standard C stream, you should create a replacement
|
||||||
|
read_data function and use it at run time with png_set_read_fn(), rather
|
||||||
|
than changing the library. */
|
||||||
|
#ifndef USE_FAR_KEYWORD
|
||||||
|
void PNGAPI
|
||||||
|
png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
||||||
|
{
|
||||||
|
png_size_t check;
|
||||||
|
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
/* fread() returns 0 on error, so it is OK to store this in a png_size_t
|
||||||
|
* instead of an int, which is what fread() actually returns.
|
||||||
|
*/
|
||||||
|
#if defined(_WIN32_WCE)
|
||||||
|
if ( !ReadFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
|
||||||
|
check = 0;
|
||||||
|
#else
|
||||||
|
check = (png_size_t)fread(data, (png_size_t)1, length,
|
||||||
|
(png_FILE_p)png_ptr->io_ptr);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (check != length)
|
||||||
|
png_error(png_ptr, "Read Error");
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
/* this is the model-independent version. Since the standard I/O library
|
||||||
|
can't handle far buffers in the medium and small models, we have to copy
|
||||||
|
the data.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define NEAR_BUF_SIZE 1024
|
||||||
|
#define MIN(a,b) (a <= b ? a : b)
|
||||||
|
|
||||||
|
static void PNGAPI
|
||||||
|
png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
||||||
|
{
|
||||||
|
int check;
|
||||||
|
png_byte *n_data;
|
||||||
|
png_FILE_p io_ptr;
|
||||||
|
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
/* Check if data really is near. If so, use usual code. */
|
||||||
|
n_data = (png_byte *)CVT_PTR_NOCHECK(data);
|
||||||
|
io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
|
||||||
|
if ((png_bytep)n_data == data)
|
||||||
|
{
|
||||||
|
#if defined(_WIN32_WCE)
|
||||||
|
if ( !ReadFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
|
||||||
|
check = 0;
|
||||||
|
#else
|
||||||
|
check = fread(n_data, 1, length, io_ptr);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
png_byte buf[NEAR_BUF_SIZE];
|
||||||
|
png_size_t read, remaining, err;
|
||||||
|
check = 0;
|
||||||
|
remaining = length;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
read = MIN(NEAR_BUF_SIZE, remaining);
|
||||||
|
#if defined(_WIN32_WCE)
|
||||||
|
if ( !ReadFile((HANDLE)(io_ptr), buf, read, &err, NULL) )
|
||||||
|
err = 0;
|
||||||
|
#else
|
||||||
|
err = fread(buf, (png_size_t)1, read, io_ptr);
|
||||||
|
#endif
|
||||||
|
png_memcpy(data, buf, read); /* copy far buffer to near buffer */
|
||||||
|
if(err != read)
|
||||||
|
break;
|
||||||
|
else
|
||||||
|
check += err;
|
||||||
|
data += read;
|
||||||
|
remaining -= read;
|
||||||
|
}
|
||||||
|
while (remaining != 0);
|
||||||
|
}
|
||||||
|
if ((png_uint_32)check != (png_uint_32)length)
|
||||||
|
png_error(png_ptr, "read Error");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* This function allows the application to supply a new input function
|
||||||
|
for libpng if standard C streams aren't being used.
|
||||||
|
|
||||||
|
This function takes as its arguments:
|
||||||
|
png_ptr - pointer to a png input data structure
|
||||||
|
io_ptr - pointer to user supplied structure containing info about
|
||||||
|
the input functions. May be NULL.
|
||||||
|
read_data_fn - pointer to a new input function that takes as its
|
||||||
|
arguments a pointer to a png_struct, a pointer to
|
||||||
|
a location where input data can be stored, and a 32-bit
|
||||||
|
unsigned int that is the number of bytes to be read.
|
||||||
|
To exit and output any fatal error messages the new write
|
||||||
|
function should call png_error(png_ptr, "Error msg"). */
|
||||||
|
void PNGAPI
|
||||||
|
png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
|
||||||
|
png_rw_ptr read_data_fn)
|
||||||
|
{
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_ptr->io_ptr = io_ptr;
|
||||||
|
|
||||||
|
#if !defined(PNG_NO_STDIO)
|
||||||
|
if (read_data_fn != NULL)
|
||||||
|
png_ptr->read_data_fn = read_data_fn;
|
||||||
|
else
|
||||||
|
png_ptr->read_data_fn = png_default_read_data;
|
||||||
|
#else
|
||||||
|
png_ptr->read_data_fn = read_data_fn;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* It is an error to write to a read device */
|
||||||
|
if (png_ptr->write_data_fn != NULL)
|
||||||
|
{
|
||||||
|
png_ptr->write_data_fn = NULL;
|
||||||
|
png_warning(png_ptr,
|
||||||
|
"It's an error to set both read_data_fn and write_data_fn in the ");
|
||||||
|
png_warning(png_ptr,
|
||||||
|
"same structure. Resetting write_data_fn to NULL.");
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_WRITE_FLUSH_SUPPORTED)
|
||||||
|
png_ptr->output_flush_fn = NULL;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif /* PNG_READ_SUPPORTED */
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,661 @@
|
||||||
|
|
||||||
|
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
|
||||||
|
*
|
||||||
|
* Last changed in libpng 1.2.13 November 13, 2006
|
||||||
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
|
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
|
||||||
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define PNG_INTERNAL
|
||||||
|
#include "png.h"
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
|
||||||
|
#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
|
||||||
|
/* turn on BGR-to-RGB mapping */
|
||||||
|
void PNGAPI
|
||||||
|
png_set_bgr(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_bgr\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_ptr->transformations |= PNG_BGR;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
|
||||||
|
/* turn on 16 bit byte swapping */
|
||||||
|
void PNGAPI
|
||||||
|
png_set_swap(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_swap\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
if (png_ptr->bit_depth == 16)
|
||||||
|
png_ptr->transformations |= PNG_SWAP_BYTES;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
|
||||||
|
/* turn on pixel packing */
|
||||||
|
void PNGAPI
|
||||||
|
png_set_packing(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_packing\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
if (png_ptr->bit_depth < 8)
|
||||||
|
{
|
||||||
|
png_ptr->transformations |= PNG_PACK;
|
||||||
|
png_ptr->usr_bit_depth = 8;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
|
||||||
|
/* turn on packed pixel swapping */
|
||||||
|
void PNGAPI
|
||||||
|
png_set_packswap(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_packswap\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
if (png_ptr->bit_depth < 8)
|
||||||
|
png_ptr->transformations |= PNG_PACKSWAP;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
|
||||||
|
void PNGAPI
|
||||||
|
png_set_shift(png_structp png_ptr, png_color_8p true_bits)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_shift\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_ptr->transformations |= PNG_SHIFT;
|
||||||
|
png_ptr->shift = *true_bits;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
|
||||||
|
defined(PNG_WRITE_INTERLACING_SUPPORTED)
|
||||||
|
int PNGAPI
|
||||||
|
png_set_interlace_handling(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_interlace handling\n");
|
||||||
|
if (png_ptr && png_ptr->interlaced)
|
||||||
|
{
|
||||||
|
png_ptr->transformations |= PNG_INTERLACE;
|
||||||
|
return (7);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (1);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
|
||||||
|
/* Add a filler byte on read, or remove a filler or alpha byte on write.
|
||||||
|
* The filler type has changed in v0.95 to allow future 2-byte fillers
|
||||||
|
* for 48-bit input data, as well as to avoid problems with some compilers
|
||||||
|
* that don't like bytes as parameters.
|
||||||
|
*/
|
||||||
|
void PNGAPI
|
||||||
|
png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_filler\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_ptr->transformations |= PNG_FILLER;
|
||||||
|
png_ptr->filler = (png_byte)filler;
|
||||||
|
if (filler_loc == PNG_FILLER_AFTER)
|
||||||
|
png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
|
||||||
|
else
|
||||||
|
png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
|
||||||
|
|
||||||
|
/* This should probably go in the "do_read_filler" routine.
|
||||||
|
* I attempted to do that in libpng-1.0.1a but that caused problems
|
||||||
|
* so I restored it in libpng-1.0.2a
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
|
||||||
|
{
|
||||||
|
png_ptr->usr_channels = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Also I added this in libpng-1.0.2a (what happens when we expand
|
||||||
|
* a less-than-8-bit grayscale to GA? */
|
||||||
|
|
||||||
|
if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY && png_ptr->bit_depth >= 8)
|
||||||
|
{
|
||||||
|
png_ptr->usr_channels = 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#if !defined(PNG_1_0_X)
|
||||||
|
/* Added to libpng-1.2.7 */
|
||||||
|
void PNGAPI
|
||||||
|
png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_add_alpha\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_set_filler(png_ptr, filler, filler_loc);
|
||||||
|
png_ptr->transformations |= PNG_ADD_ALPHA;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
|
||||||
|
defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
|
||||||
|
void PNGAPI
|
||||||
|
png_set_swap_alpha(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_swap_alpha\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_ptr->transformations |= PNG_SWAP_ALPHA;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
|
||||||
|
defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
|
||||||
|
void PNGAPI
|
||||||
|
png_set_invert_alpha(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_invert_alpha\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_ptr->transformations |= PNG_INVERT_ALPHA;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
|
||||||
|
void PNGAPI
|
||||||
|
png_set_invert_mono(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_invert_mono\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_ptr->transformations |= PNG_INVERT_MONO;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* invert monochrome grayscale data */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_invert(png_row_infop row_info, png_bytep row)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_invert\n");
|
||||||
|
/* This test removed from libpng version 1.0.13 and 1.2.0:
|
||||||
|
* if (row_info->bit_depth == 1 &&
|
||||||
|
*/
|
||||||
|
#if defined(PNG_USELESS_TESTS_SUPPORTED)
|
||||||
|
if (row == NULL || row_info == NULL)
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
|
if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
|
||||||
|
{
|
||||||
|
png_bytep rp = row;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 istop = row_info->rowbytes;
|
||||||
|
|
||||||
|
for (i = 0; i < istop; i++)
|
||||||
|
{
|
||||||
|
*rp = (png_byte)(~(*rp));
|
||||||
|
rp++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
|
||||||
|
row_info->bit_depth == 8)
|
||||||
|
{
|
||||||
|
png_bytep rp = row;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 istop = row_info->rowbytes;
|
||||||
|
|
||||||
|
for (i = 0; i < istop; i+=2)
|
||||||
|
{
|
||||||
|
*rp = (png_byte)(~(*rp));
|
||||||
|
rp+=2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
|
||||||
|
row_info->bit_depth == 16)
|
||||||
|
{
|
||||||
|
png_bytep rp = row;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 istop = row_info->rowbytes;
|
||||||
|
|
||||||
|
for (i = 0; i < istop; i+=4)
|
||||||
|
{
|
||||||
|
*rp = (png_byte)(~(*rp));
|
||||||
|
*(rp+1) = (png_byte)(~(*(rp+1)));
|
||||||
|
rp+=4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
|
||||||
|
/* swaps byte order on 16 bit depth images */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_swap(png_row_infop row_info, png_bytep row)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_swap\n");
|
||||||
|
if (
|
||||||
|
#if defined(PNG_USELESS_TESTS_SUPPORTED)
|
||||||
|
row != NULL && row_info != NULL &&
|
||||||
|
#endif
|
||||||
|
row_info->bit_depth == 16)
|
||||||
|
{
|
||||||
|
png_bytep rp = row;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 istop= row_info->width * row_info->channels;
|
||||||
|
|
||||||
|
for (i = 0; i < istop; i++, rp += 2)
|
||||||
|
{
|
||||||
|
png_byte t = *rp;
|
||||||
|
*rp = *(rp + 1);
|
||||||
|
*(rp + 1) = t;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
|
||||||
|
static PNG_CONST png_byte onebppswaptable[256] = {
|
||||||
|
0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
|
||||||
|
0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
|
||||||
|
0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
|
||||||
|
0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
|
||||||
|
0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
|
||||||
|
0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
|
||||||
|
0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
|
||||||
|
0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
|
||||||
|
0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
|
||||||
|
0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
|
||||||
|
0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
|
||||||
|
0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
|
||||||
|
0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
|
||||||
|
0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
|
||||||
|
0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
|
||||||
|
0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
|
||||||
|
0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
|
||||||
|
0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
|
||||||
|
0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
|
||||||
|
0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
|
||||||
|
0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
|
||||||
|
0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
|
||||||
|
0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
|
||||||
|
0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
|
||||||
|
0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
|
||||||
|
0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
|
||||||
|
0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
|
||||||
|
0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
|
||||||
|
0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
|
||||||
|
0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
|
||||||
|
0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
|
||||||
|
0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
|
||||||
|
};
|
||||||
|
|
||||||
|
static PNG_CONST png_byte twobppswaptable[256] = {
|
||||||
|
0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
|
||||||
|
0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
|
||||||
|
0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
|
||||||
|
0x24, 0x64, 0xA4, 0xE4, 0x34, 0x74, 0xB4, 0xF4,
|
||||||
|
0x08, 0x48, 0x88, 0xC8, 0x18, 0x58, 0x98, 0xD8,
|
||||||
|
0x28, 0x68, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8,
|
||||||
|
0x0C, 0x4C, 0x8C, 0xCC, 0x1C, 0x5C, 0x9C, 0xDC,
|
||||||
|
0x2C, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,
|
||||||
|
0x01, 0x41, 0x81, 0xC1, 0x11, 0x51, 0x91, 0xD1,
|
||||||
|
0x21, 0x61, 0xA1, 0xE1, 0x31, 0x71, 0xB1, 0xF1,
|
||||||
|
0x05, 0x45, 0x85, 0xC5, 0x15, 0x55, 0x95, 0xD5,
|
||||||
|
0x25, 0x65, 0xA5, 0xE5, 0x35, 0x75, 0xB5, 0xF5,
|
||||||
|
0x09, 0x49, 0x89, 0xC9, 0x19, 0x59, 0x99, 0xD9,
|
||||||
|
0x29, 0x69, 0xA9, 0xE9, 0x39, 0x79, 0xB9, 0xF9,
|
||||||
|
0x0D, 0x4D, 0x8D, 0xCD, 0x1D, 0x5D, 0x9D, 0xDD,
|
||||||
|
0x2D, 0x6D, 0xAD, 0xED, 0x3D, 0x7D, 0xBD, 0xFD,
|
||||||
|
0x02, 0x42, 0x82, 0xC2, 0x12, 0x52, 0x92, 0xD2,
|
||||||
|
0x22, 0x62, 0xA2, 0xE2, 0x32, 0x72, 0xB2, 0xF2,
|
||||||
|
0x06, 0x46, 0x86, 0xC6, 0x16, 0x56, 0x96, 0xD6,
|
||||||
|
0x26, 0x66, 0xA6, 0xE6, 0x36, 0x76, 0xB6, 0xF6,
|
||||||
|
0x0A, 0x4A, 0x8A, 0xCA, 0x1A, 0x5A, 0x9A, 0xDA,
|
||||||
|
0x2A, 0x6A, 0xAA, 0xEA, 0x3A, 0x7A, 0xBA, 0xFA,
|
||||||
|
0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xDE,
|
||||||
|
0x2E, 0x6E, 0xAE, 0xEE, 0x3E, 0x7E, 0xBE, 0xFE,
|
||||||
|
0x03, 0x43, 0x83, 0xC3, 0x13, 0x53, 0x93, 0xD3,
|
||||||
|
0x23, 0x63, 0xA3, 0xE3, 0x33, 0x73, 0xB3, 0xF3,
|
||||||
|
0x07, 0x47, 0x87, 0xC7, 0x17, 0x57, 0x97, 0xD7,
|
||||||
|
0x27, 0x67, 0xA7, 0xE7, 0x37, 0x77, 0xB7, 0xF7,
|
||||||
|
0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x5B, 0x9B, 0xDB,
|
||||||
|
0x2B, 0x6B, 0xAB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB,
|
||||||
|
0x0F, 0x4F, 0x8F, 0xCF, 0x1F, 0x5F, 0x9F, 0xDF,
|
||||||
|
0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
|
||||||
|
};
|
||||||
|
|
||||||
|
static PNG_CONST png_byte fourbppswaptable[256] = {
|
||||||
|
0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
|
||||||
|
0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
|
||||||
|
0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
|
||||||
|
0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,
|
||||||
|
0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
|
||||||
|
0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0xF2,
|
||||||
|
0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
|
||||||
|
0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3, 0xF3,
|
||||||
|
0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
|
||||||
|
0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4,
|
||||||
|
0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
|
||||||
|
0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5, 0xF5,
|
||||||
|
0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
|
||||||
|
0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6, 0xF6,
|
||||||
|
0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
|
||||||
|
0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7,
|
||||||
|
0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
|
||||||
|
0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8,
|
||||||
|
0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
|
||||||
|
0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9,
|
||||||
|
0x0A, 0x1A, 0x2A, 0x3A, 0x4A, 0x5A, 0x6A, 0x7A,
|
||||||
|
0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,
|
||||||
|
0x0B, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B,
|
||||||
|
0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB, 0xFB,
|
||||||
|
0x0C, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C,
|
||||||
|
0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC, 0xFC,
|
||||||
|
0x0D, 0x1D, 0x2D, 0x3D, 0x4D, 0x5D, 0x6D, 0x7D,
|
||||||
|
0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD,
|
||||||
|
0x0E, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,
|
||||||
|
0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,
|
||||||
|
0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,
|
||||||
|
0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF
|
||||||
|
};
|
||||||
|
|
||||||
|
/* swaps pixel packing order within bytes */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_packswap(png_row_infop row_info, png_bytep row)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_packswap\n");
|
||||||
|
if (
|
||||||
|
#if defined(PNG_USELESS_TESTS_SUPPORTED)
|
||||||
|
row != NULL && row_info != NULL &&
|
||||||
|
#endif
|
||||||
|
row_info->bit_depth < 8)
|
||||||
|
{
|
||||||
|
png_bytep rp, end, table;
|
||||||
|
|
||||||
|
end = row + row_info->rowbytes;
|
||||||
|
|
||||||
|
if (row_info->bit_depth == 1)
|
||||||
|
table = (png_bytep)onebppswaptable;
|
||||||
|
else if (row_info->bit_depth == 2)
|
||||||
|
table = (png_bytep)twobppswaptable;
|
||||||
|
else if (row_info->bit_depth == 4)
|
||||||
|
table = (png_bytep)fourbppswaptable;
|
||||||
|
else
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (rp = row; rp < end; rp++)
|
||||||
|
*rp = table[*rp];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
|
||||||
|
|
||||||
|
#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
|
||||||
|
defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
|
||||||
|
/* remove filler or alpha byte(s) */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_strip_filler\n");
|
||||||
|
#if defined(PNG_USELESS_TESTS_SUPPORTED)
|
||||||
|
if (row != NULL && row_info != NULL)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
png_bytep sp=row;
|
||||||
|
png_bytep dp=row;
|
||||||
|
png_uint_32 row_width=row_info->width;
|
||||||
|
png_uint_32 i;
|
||||||
|
|
||||||
|
if ((row_info->color_type == PNG_COLOR_TYPE_RGB ||
|
||||||
|
(row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
|
||||||
|
(flags & PNG_FLAG_STRIP_ALPHA))) &&
|
||||||
|
row_info->channels == 4)
|
||||||
|
{
|
||||||
|
if (row_info->bit_depth == 8)
|
||||||
|
{
|
||||||
|
/* This converts from RGBX or RGBA to RGB */
|
||||||
|
if (flags & PNG_FLAG_FILLER_AFTER)
|
||||||
|
{
|
||||||
|
dp+=3; sp+=4;
|
||||||
|
for (i = 1; i < row_width; i++)
|
||||||
|
{
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
sp++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* This converts from XRGB or ARGB to RGB */
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (i = 0; i < row_width; i++)
|
||||||
|
{
|
||||||
|
sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
row_info->pixel_depth = 24;
|
||||||
|
row_info->rowbytes = row_width * 3;
|
||||||
|
}
|
||||||
|
else /* if (row_info->bit_depth == 16) */
|
||||||
|
{
|
||||||
|
if (flags & PNG_FLAG_FILLER_AFTER)
|
||||||
|
{
|
||||||
|
/* This converts from RRGGBBXX or RRGGBBAA to RRGGBB */
|
||||||
|
sp += 8; dp += 6;
|
||||||
|
for (i = 1; i < row_width; i++)
|
||||||
|
{
|
||||||
|
/* This could be (although png_memcpy is probably slower):
|
||||||
|
png_memcpy(dp, sp, 6);
|
||||||
|
sp += 8;
|
||||||
|
dp += 6;
|
||||||
|
*/
|
||||||
|
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
sp += 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* This converts from XXRRGGBB or AARRGGBB to RRGGBB */
|
||||||
|
for (i = 0; i < row_width; i++)
|
||||||
|
{
|
||||||
|
/* This could be (although png_memcpy is probably slower):
|
||||||
|
png_memcpy(dp, sp, 6);
|
||||||
|
sp += 8;
|
||||||
|
dp += 6;
|
||||||
|
*/
|
||||||
|
|
||||||
|
sp+=2;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
row_info->pixel_depth = 48;
|
||||||
|
row_info->rowbytes = row_width * 6;
|
||||||
|
}
|
||||||
|
row_info->channels = 3;
|
||||||
|
}
|
||||||
|
else if ((row_info->color_type == PNG_COLOR_TYPE_GRAY ||
|
||||||
|
(row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
|
||||||
|
(flags & PNG_FLAG_STRIP_ALPHA))) &&
|
||||||
|
row_info->channels == 2)
|
||||||
|
{
|
||||||
|
if (row_info->bit_depth == 8)
|
||||||
|
{
|
||||||
|
/* This converts from GX or GA to G */
|
||||||
|
if (flags & PNG_FLAG_FILLER_AFTER)
|
||||||
|
{
|
||||||
|
for (i = 0; i < row_width; i++)
|
||||||
|
{
|
||||||
|
*dp++ = *sp++;
|
||||||
|
sp++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* This converts from XG or AG to G */
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (i = 0; i < row_width; i++)
|
||||||
|
{
|
||||||
|
sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
row_info->pixel_depth = 8;
|
||||||
|
row_info->rowbytes = row_width;
|
||||||
|
}
|
||||||
|
else /* if (row_info->bit_depth == 16) */
|
||||||
|
{
|
||||||
|
if (flags & PNG_FLAG_FILLER_AFTER)
|
||||||
|
{
|
||||||
|
/* This converts from GGXX or GGAA to GG */
|
||||||
|
sp += 4; dp += 2;
|
||||||
|
for (i = 1; i < row_width; i++)
|
||||||
|
{
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
sp += 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* This converts from XXGG or AAGG to GG */
|
||||||
|
for (i = 0; i < row_width; i++)
|
||||||
|
{
|
||||||
|
sp += 2;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
*dp++ = *sp++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
row_info->pixel_depth = 16;
|
||||||
|
row_info->rowbytes = row_width * 2;
|
||||||
|
}
|
||||||
|
row_info->channels = 1;
|
||||||
|
}
|
||||||
|
if (flags & PNG_FLAG_STRIP_ALPHA)
|
||||||
|
row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
|
||||||
|
/* swaps red and blue bytes within a pixel */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_bgr(png_row_infop row_info, png_bytep row)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_bgr\n");
|
||||||
|
if (
|
||||||
|
#if defined(PNG_USELESS_TESTS_SUPPORTED)
|
||||||
|
row != NULL && row_info != NULL &&
|
||||||
|
#endif
|
||||||
|
(row_info->color_type & PNG_COLOR_MASK_COLOR))
|
||||||
|
{
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
if (row_info->bit_depth == 8)
|
||||||
|
{
|
||||||
|
if (row_info->color_type == PNG_COLOR_TYPE_RGB)
|
||||||
|
{
|
||||||
|
png_bytep rp;
|
||||||
|
png_uint_32 i;
|
||||||
|
|
||||||
|
for (i = 0, rp = row; i < row_width; i++, rp += 3)
|
||||||
|
{
|
||||||
|
png_byte save = *rp;
|
||||||
|
*rp = *(rp + 2);
|
||||||
|
*(rp + 2) = save;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
||||||
|
{
|
||||||
|
png_bytep rp;
|
||||||
|
png_uint_32 i;
|
||||||
|
|
||||||
|
for (i = 0, rp = row; i < row_width; i++, rp += 4)
|
||||||
|
{
|
||||||
|
png_byte save = *rp;
|
||||||
|
*rp = *(rp + 2);
|
||||||
|
*(rp + 2) = save;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (row_info->bit_depth == 16)
|
||||||
|
{
|
||||||
|
if (row_info->color_type == PNG_COLOR_TYPE_RGB)
|
||||||
|
{
|
||||||
|
png_bytep rp;
|
||||||
|
png_uint_32 i;
|
||||||
|
|
||||||
|
for (i = 0, rp = row; i < row_width; i++, rp += 6)
|
||||||
|
{
|
||||||
|
png_byte save = *rp;
|
||||||
|
*rp = *(rp + 4);
|
||||||
|
*(rp + 4) = save;
|
||||||
|
save = *(rp + 1);
|
||||||
|
*(rp + 1) = *(rp + 5);
|
||||||
|
*(rp + 5) = save;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
||||||
|
{
|
||||||
|
png_bytep rp;
|
||||||
|
png_uint_32 i;
|
||||||
|
|
||||||
|
for (i = 0, rp = row; i < row_width; i++, rp += 8)
|
||||||
|
{
|
||||||
|
png_byte save = *rp;
|
||||||
|
*rp = *(rp + 4);
|
||||||
|
*(rp + 4) = save;
|
||||||
|
save = *(rp + 1);
|
||||||
|
*(rp + 1) = *(rp + 5);
|
||||||
|
*(rp + 5) = save;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
|
||||||
|
|
||||||
|
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
|
||||||
|
defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
|
||||||
|
defined(PNG_LEGACY_SUPPORTED)
|
||||||
|
void PNGAPI
|
||||||
|
png_set_user_transform_info(png_structp png_ptr, png_voidp
|
||||||
|
user_transform_ptr, int user_transform_depth, int user_transform_channels)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_set_user_transform_info\n");
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
|
||||||
|
png_ptr->user_transform_ptr = user_transform_ptr;
|
||||||
|
png_ptr->user_transform_depth = (png_byte)user_transform_depth;
|
||||||
|
png_ptr->user_transform_channels = (png_byte)user_transform_channels;
|
||||||
|
#else
|
||||||
|
if(user_transform_ptr || user_transform_depth || user_transform_channels)
|
||||||
|
png_warning(png_ptr,
|
||||||
|
"This version of libpng does not support user transform info");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* This function returns a pointer to the user_transform_ptr associated with
|
||||||
|
* the user transform functions. The application should free any memory
|
||||||
|
* associated with this pointer before png_write_destroy and png_read_destroy
|
||||||
|
* are called.
|
||||||
|
*/
|
||||||
|
png_voidp PNGAPI
|
||||||
|
png_get_user_transform_ptr(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr == NULL) return (NULL);
|
||||||
|
#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
|
||||||
|
return ((png_voidp)png_ptr->user_transform_ptr);
|
||||||
|
#endif
|
||||||
|
return (NULL);
|
||||||
|
}
|
||||||
|
#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,234 @@
|
||||||
|
|
||||||
|
/* pngwio.c - functions for data output
|
||||||
|
*
|
||||||
|
* Last changed in libpng 1.2.13 November 13, 2006
|
||||||
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
|
* Copyright (c) 1998-2002 Glenn Randers-Pehrson
|
||||||
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
|
*
|
||||||
|
* This file provides a location for all output. Users who need
|
||||||
|
* special handling are expected to write functions that have the same
|
||||||
|
* arguments as these and perform similar functions, but that possibly
|
||||||
|
* use different output methods. Note that you shouldn't change these
|
||||||
|
* functions, but rather write replacement functions and then change
|
||||||
|
* them at run time with png_set_write_fn(...).
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define PNG_INTERNAL
|
||||||
|
#include "png.h"
|
||||||
|
#ifdef PNG_WRITE_SUPPORTED
|
||||||
|
|
||||||
|
/* Write the data to whatever output you are using. The default routine
|
||||||
|
writes to a file pointer. Note that this routine sometimes gets called
|
||||||
|
with very small lengths, so you should implement some kind of simple
|
||||||
|
buffering if you are using unbuffered writes. This should never be asked
|
||||||
|
to write more than 64K on a 16 bit machine. */
|
||||||
|
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
||||||
|
{
|
||||||
|
if (png_ptr->write_data_fn != NULL )
|
||||||
|
(*(png_ptr->write_data_fn))(png_ptr, data, length);
|
||||||
|
else
|
||||||
|
png_error(png_ptr, "Call to NULL write function");
|
||||||
|
}
|
||||||
|
|
||||||
|
#if !defined(PNG_NO_STDIO)
|
||||||
|
/* This is the function that does the actual writing of data. If you are
|
||||||
|
not writing to a standard C stream, you should create a replacement
|
||||||
|
write_data function and use it at run time with png_set_write_fn(), rather
|
||||||
|
than changing the library. */
|
||||||
|
#ifndef USE_FAR_KEYWORD
|
||||||
|
void PNGAPI
|
||||||
|
png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
||||||
|
{
|
||||||
|
png_uint_32 check;
|
||||||
|
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
#if defined(_WIN32_WCE)
|
||||||
|
if ( !WriteFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
|
||||||
|
check = 0;
|
||||||
|
#else
|
||||||
|
check = fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
|
||||||
|
#endif
|
||||||
|
if (check != length)
|
||||||
|
png_error(png_ptr, "Write Error");
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
/* this is the model-independent version. Since the standard I/O library
|
||||||
|
can't handle far buffers in the medium and small models, we have to copy
|
||||||
|
the data.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define NEAR_BUF_SIZE 1024
|
||||||
|
#define MIN(a,b) (a <= b ? a : b)
|
||||||
|
|
||||||
|
void PNGAPI
|
||||||
|
png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
|
||||||
|
{
|
||||||
|
png_uint_32 check;
|
||||||
|
png_byte *near_data; /* Needs to be "png_byte *" instead of "png_bytep" */
|
||||||
|
png_FILE_p io_ptr;
|
||||||
|
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
/* Check if data really is near. If so, use usual code. */
|
||||||
|
near_data = (png_byte *)CVT_PTR_NOCHECK(data);
|
||||||
|
io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
|
||||||
|
if ((png_bytep)near_data == data)
|
||||||
|
{
|
||||||
|
#if defined(_WIN32_WCE)
|
||||||
|
if ( !WriteFile(io_ptr, near_data, length, &check, NULL) )
|
||||||
|
check = 0;
|
||||||
|
#else
|
||||||
|
check = fwrite(near_data, 1, length, io_ptr);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
png_byte buf[NEAR_BUF_SIZE];
|
||||||
|
png_size_t written, remaining, err;
|
||||||
|
check = 0;
|
||||||
|
remaining = length;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
written = MIN(NEAR_BUF_SIZE, remaining);
|
||||||
|
png_memcpy(buf, data, written); /* copy far buffer to near buffer */
|
||||||
|
#if defined(_WIN32_WCE)
|
||||||
|
if ( !WriteFile(io_ptr, buf, written, &err, NULL) )
|
||||||
|
err = 0;
|
||||||
|
#else
|
||||||
|
err = fwrite(buf, 1, written, io_ptr);
|
||||||
|
#endif
|
||||||
|
if (err != written)
|
||||||
|
break;
|
||||||
|
else
|
||||||
|
check += err;
|
||||||
|
data += written;
|
||||||
|
remaining -= written;
|
||||||
|
}
|
||||||
|
while (remaining != 0);
|
||||||
|
}
|
||||||
|
if (check != length)
|
||||||
|
png_error(png_ptr, "Write Error");
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* This function is called to output any data pending writing (normally
|
||||||
|
to disk). After png_flush is called, there should be no data pending
|
||||||
|
writing in any buffers. */
|
||||||
|
#if defined(PNG_WRITE_FLUSH_SUPPORTED)
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_flush(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
if (png_ptr->output_flush_fn != NULL)
|
||||||
|
(*(png_ptr->output_flush_fn))(png_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if !defined(PNG_NO_STDIO)
|
||||||
|
void PNGAPI
|
||||||
|
png_default_flush(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
#if !defined(_WIN32_WCE)
|
||||||
|
png_FILE_p io_ptr;
|
||||||
|
#endif
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
#if !defined(_WIN32_WCE)
|
||||||
|
io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
|
||||||
|
if (io_ptr != NULL)
|
||||||
|
fflush(io_ptr);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* This function allows the application to supply new output functions for
|
||||||
|
libpng if standard C streams aren't being used.
|
||||||
|
|
||||||
|
This function takes as its arguments:
|
||||||
|
png_ptr - pointer to a png output data structure
|
||||||
|
io_ptr - pointer to user supplied structure containing info about
|
||||||
|
the output functions. May be NULL.
|
||||||
|
write_data_fn - pointer to a new output function that takes as its
|
||||||
|
arguments a pointer to a png_struct, a pointer to
|
||||||
|
data to be written, and a 32-bit unsigned int that is
|
||||||
|
the number of bytes to be written. The new write
|
||||||
|
function should call png_error(png_ptr, "Error msg")
|
||||||
|
to exit and output any fatal error messages.
|
||||||
|
flush_data_fn - pointer to a new flush function that takes as its
|
||||||
|
arguments a pointer to a png_struct. After a call to
|
||||||
|
the flush function, there should be no data in any buffers
|
||||||
|
or pending transmission. If the output method doesn't do
|
||||||
|
any buffering of ouput, a function prototype must still be
|
||||||
|
supplied although it doesn't have to do anything. If
|
||||||
|
PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile
|
||||||
|
time, output_flush_fn will be ignored, although it must be
|
||||||
|
supplied for compatibility. */
|
||||||
|
void PNGAPI
|
||||||
|
png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
|
||||||
|
png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
|
||||||
|
{
|
||||||
|
if(png_ptr == NULL) return;
|
||||||
|
png_ptr->io_ptr = io_ptr;
|
||||||
|
|
||||||
|
#if !defined(PNG_NO_STDIO)
|
||||||
|
if (write_data_fn != NULL)
|
||||||
|
png_ptr->write_data_fn = write_data_fn;
|
||||||
|
else
|
||||||
|
png_ptr->write_data_fn = png_default_write_data;
|
||||||
|
#else
|
||||||
|
png_ptr->write_data_fn = write_data_fn;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_WRITE_FLUSH_SUPPORTED)
|
||||||
|
#if !defined(PNG_NO_STDIO)
|
||||||
|
if (output_flush_fn != NULL)
|
||||||
|
png_ptr->output_flush_fn = output_flush_fn;
|
||||||
|
else
|
||||||
|
png_ptr->output_flush_fn = png_default_flush;
|
||||||
|
#else
|
||||||
|
png_ptr->output_flush_fn = output_flush_fn;
|
||||||
|
#endif
|
||||||
|
#endif /* PNG_WRITE_FLUSH_SUPPORTED */
|
||||||
|
|
||||||
|
/* It is an error to read while writing a png file */
|
||||||
|
if (png_ptr->read_data_fn != NULL)
|
||||||
|
{
|
||||||
|
png_ptr->read_data_fn = NULL;
|
||||||
|
png_warning(png_ptr,
|
||||||
|
"Attempted to set both read_data_fn and write_data_fn in");
|
||||||
|
png_warning(png_ptr,
|
||||||
|
"the same structure. Resetting read_data_fn to NULL.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(USE_FAR_KEYWORD)
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
void *png_far_to_near(png_structp png_ptr,png_voidp ptr, int check)
|
||||||
|
{
|
||||||
|
void *near_ptr;
|
||||||
|
void FAR *far_ptr;
|
||||||
|
FP_OFF(near_ptr) = FP_OFF(ptr);
|
||||||
|
far_ptr = (void FAR *)near_ptr;
|
||||||
|
if(check != 0)
|
||||||
|
if(FP_SEG(ptr) != FP_SEG(far_ptr))
|
||||||
|
png_error(png_ptr,"segment lost in conversion");
|
||||||
|
return(near_ptr);
|
||||||
|
}
|
||||||
|
# else
|
||||||
|
void *png_far_to_near(png_structp png_ptr,png_voidp ptr, int check)
|
||||||
|
{
|
||||||
|
void *near_ptr;
|
||||||
|
void FAR *far_ptr;
|
||||||
|
near_ptr = (void FAR *)ptr;
|
||||||
|
far_ptr = (void FAR *)near_ptr;
|
||||||
|
if(check != 0)
|
||||||
|
if(far_ptr != ptr)
|
||||||
|
png_error(png_ptr,"segment lost in conversion");
|
||||||
|
return(near_ptr);
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#endif /* PNG_WRITE_SUPPORTED */
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,572 @@
|
||||||
|
|
||||||
|
/* pngwtran.c - transforms the data in a row for PNG writers
|
||||||
|
*
|
||||||
|
* Last changed in libpng 1.2.9 April 14, 2006
|
||||||
|
* For conditions of distribution and use, see copyright notice in png.h
|
||||||
|
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
|
||||||
|
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
|
||||||
|
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define PNG_INTERNAL
|
||||||
|
#include "png.h"
|
||||||
|
#ifdef PNG_WRITE_SUPPORTED
|
||||||
|
|
||||||
|
/* Transform the data according to the user's wishes. The order of
|
||||||
|
* transformations is significant.
|
||||||
|
*/
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_write_transformations(png_structp png_ptr)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_write_transformations\n");
|
||||||
|
|
||||||
|
if (png_ptr == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
|
||||||
|
if (png_ptr->transformations & PNG_USER_TRANSFORM)
|
||||||
|
if(png_ptr->write_user_transform_fn != NULL)
|
||||||
|
(*(png_ptr->write_user_transform_fn)) /* user write transform function */
|
||||||
|
(png_ptr, /* png_ptr */
|
||||||
|
&(png_ptr->row_info), /* row_info: */
|
||||||
|
/* png_uint_32 width; width of row */
|
||||||
|
/* png_uint_32 rowbytes; number of bytes in row */
|
||||||
|
/* png_byte color_type; color type of pixels */
|
||||||
|
/* png_byte bit_depth; bit depth of samples */
|
||||||
|
/* png_byte channels; number of channels (1-4) */
|
||||||
|
/* png_byte pixel_depth; bits per pixel (depth*channels) */
|
||||||
|
png_ptr->row_buf + 1); /* start of pixel data for row */
|
||||||
|
#endif
|
||||||
|
#if defined(PNG_WRITE_FILLER_SUPPORTED)
|
||||||
|
if (png_ptr->transformations & PNG_FILLER)
|
||||||
|
png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
|
||||||
|
png_ptr->flags);
|
||||||
|
#endif
|
||||||
|
#if defined(PNG_WRITE_PACKSWAP_SUPPORTED)
|
||||||
|
if (png_ptr->transformations & PNG_PACKSWAP)
|
||||||
|
png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
|
||||||
|
#endif
|
||||||
|
#if defined(PNG_WRITE_PACK_SUPPORTED)
|
||||||
|
if (png_ptr->transformations & PNG_PACK)
|
||||||
|
png_do_pack(&(png_ptr->row_info), png_ptr->row_buf + 1,
|
||||||
|
(png_uint_32)png_ptr->bit_depth);
|
||||||
|
#endif
|
||||||
|
#if defined(PNG_WRITE_SWAP_SUPPORTED)
|
||||||
|
if (png_ptr->transformations & PNG_SWAP_BYTES)
|
||||||
|
png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
|
||||||
|
#endif
|
||||||
|
#if defined(PNG_WRITE_SHIFT_SUPPORTED)
|
||||||
|
if (png_ptr->transformations & PNG_SHIFT)
|
||||||
|
png_do_shift(&(png_ptr->row_info), png_ptr->row_buf + 1,
|
||||||
|
&(png_ptr->shift));
|
||||||
|
#endif
|
||||||
|
#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
|
||||||
|
if (png_ptr->transformations & PNG_SWAP_ALPHA)
|
||||||
|
png_do_write_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
|
||||||
|
#endif
|
||||||
|
#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
|
||||||
|
if (png_ptr->transformations & PNG_INVERT_ALPHA)
|
||||||
|
png_do_write_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
|
||||||
|
#endif
|
||||||
|
#if defined(PNG_WRITE_BGR_SUPPORTED)
|
||||||
|
if (png_ptr->transformations & PNG_BGR)
|
||||||
|
png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
|
||||||
|
#endif
|
||||||
|
#if defined(PNG_WRITE_INVERT_SUPPORTED)
|
||||||
|
if (png_ptr->transformations & PNG_INVERT_MONO)
|
||||||
|
png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(PNG_WRITE_PACK_SUPPORTED)
|
||||||
|
/* Pack pixels into bytes. Pass the true bit depth in bit_depth. The
|
||||||
|
* row_info bit depth should be 8 (one pixel per byte). The channels
|
||||||
|
* should be 1 (this only happens on grayscale and paletted images).
|
||||||
|
*/
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_pack\n");
|
||||||
|
if (row_info->bit_depth == 8 &&
|
||||||
|
#if defined(PNG_USELESS_TESTS_SUPPORTED)
|
||||||
|
row != NULL && row_info != NULL &&
|
||||||
|
#endif
|
||||||
|
row_info->channels == 1)
|
||||||
|
{
|
||||||
|
switch ((int)bit_depth)
|
||||||
|
{
|
||||||
|
case 1:
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
int mask, v;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
|
||||||
|
sp = row;
|
||||||
|
dp = row;
|
||||||
|
mask = 0x80;
|
||||||
|
v = 0;
|
||||||
|
|
||||||
|
for (i = 0; i < row_width; i++)
|
||||||
|
{
|
||||||
|
if (*sp != 0)
|
||||||
|
v |= mask;
|
||||||
|
sp++;
|
||||||
|
if (mask > 1)
|
||||||
|
mask >>= 1;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mask = 0x80;
|
||||||
|
*dp = (png_byte)v;
|
||||||
|
dp++;
|
||||||
|
v = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (mask != 0x80)
|
||||||
|
*dp = (png_byte)v;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 2:
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
int shift, v;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
|
||||||
|
sp = row;
|
||||||
|
dp = row;
|
||||||
|
shift = 6;
|
||||||
|
v = 0;
|
||||||
|
for (i = 0; i < row_width; i++)
|
||||||
|
{
|
||||||
|
png_byte value;
|
||||||
|
|
||||||
|
value = (png_byte)(*sp & 0x03);
|
||||||
|
v |= (value << shift);
|
||||||
|
if (shift == 0)
|
||||||
|
{
|
||||||
|
shift = 6;
|
||||||
|
*dp = (png_byte)v;
|
||||||
|
dp++;
|
||||||
|
v = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
shift -= 2;
|
||||||
|
sp++;
|
||||||
|
}
|
||||||
|
if (shift != 6)
|
||||||
|
*dp = (png_byte)v;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 4:
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
int shift, v;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
|
||||||
|
sp = row;
|
||||||
|
dp = row;
|
||||||
|
shift = 4;
|
||||||
|
v = 0;
|
||||||
|
for (i = 0; i < row_width; i++)
|
||||||
|
{
|
||||||
|
png_byte value;
|
||||||
|
|
||||||
|
value = (png_byte)(*sp & 0x0f);
|
||||||
|
v |= (value << shift);
|
||||||
|
|
||||||
|
if (shift == 0)
|
||||||
|
{
|
||||||
|
shift = 4;
|
||||||
|
*dp = (png_byte)v;
|
||||||
|
dp++;
|
||||||
|
v = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
shift -= 4;
|
||||||
|
|
||||||
|
sp++;
|
||||||
|
}
|
||||||
|
if (shift != 4)
|
||||||
|
*dp = (png_byte)v;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
row_info->bit_depth = (png_byte)bit_depth;
|
||||||
|
row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
|
||||||
|
row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
|
||||||
|
row_info->width);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_WRITE_SHIFT_SUPPORTED)
|
||||||
|
/* Shift pixel values to take advantage of whole range. Pass the
|
||||||
|
* true number of bits in bit_depth. The row should be packed
|
||||||
|
* according to row_info->bit_depth. Thus, if you had a row of
|
||||||
|
* bit depth 4, but the pixels only had values from 0 to 7, you
|
||||||
|
* would pass 3 as bit_depth, and this routine would translate the
|
||||||
|
* data to 0 to 15.
|
||||||
|
*/
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_shift\n");
|
||||||
|
#if defined(PNG_USELESS_TESTS_SUPPORTED)
|
||||||
|
if (row != NULL && row_info != NULL &&
|
||||||
|
#else
|
||||||
|
if (
|
||||||
|
#endif
|
||||||
|
row_info->color_type != PNG_COLOR_TYPE_PALETTE)
|
||||||
|
{
|
||||||
|
int shift_start[4], shift_dec[4];
|
||||||
|
int channels = 0;
|
||||||
|
|
||||||
|
if (row_info->color_type & PNG_COLOR_MASK_COLOR)
|
||||||
|
{
|
||||||
|
shift_start[channels] = row_info->bit_depth - bit_depth->red;
|
||||||
|
shift_dec[channels] = bit_depth->red;
|
||||||
|
channels++;
|
||||||
|
shift_start[channels] = row_info->bit_depth - bit_depth->green;
|
||||||
|
shift_dec[channels] = bit_depth->green;
|
||||||
|
channels++;
|
||||||
|
shift_start[channels] = row_info->bit_depth - bit_depth->blue;
|
||||||
|
shift_dec[channels] = bit_depth->blue;
|
||||||
|
channels++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
shift_start[channels] = row_info->bit_depth - bit_depth->gray;
|
||||||
|
shift_dec[channels] = bit_depth->gray;
|
||||||
|
channels++;
|
||||||
|
}
|
||||||
|
if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
|
||||||
|
{
|
||||||
|
shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
|
||||||
|
shift_dec[channels] = bit_depth->alpha;
|
||||||
|
channels++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* with low row depths, could only be grayscale, so one channel */
|
||||||
|
if (row_info->bit_depth < 8)
|
||||||
|
{
|
||||||
|
png_bytep bp = row;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_byte mask;
|
||||||
|
png_uint_32 row_bytes = row_info->rowbytes;
|
||||||
|
|
||||||
|
if (bit_depth->gray == 1 && row_info->bit_depth == 2)
|
||||||
|
mask = 0x55;
|
||||||
|
else if (row_info->bit_depth == 4 && bit_depth->gray == 3)
|
||||||
|
mask = 0x11;
|
||||||
|
else
|
||||||
|
mask = 0xff;
|
||||||
|
|
||||||
|
for (i = 0; i < row_bytes; i++, bp++)
|
||||||
|
{
|
||||||
|
png_uint_16 v;
|
||||||
|
int j;
|
||||||
|
|
||||||
|
v = *bp;
|
||||||
|
*bp = 0;
|
||||||
|
for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
|
||||||
|
{
|
||||||
|
if (j > 0)
|
||||||
|
*bp |= (png_byte)((v << j) & 0xff);
|
||||||
|
else
|
||||||
|
*bp |= (png_byte)((v >> (-j)) & mask);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (row_info->bit_depth == 8)
|
||||||
|
{
|
||||||
|
png_bytep bp = row;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 istop = channels * row_info->width;
|
||||||
|
|
||||||
|
for (i = 0; i < istop; i++, bp++)
|
||||||
|
{
|
||||||
|
|
||||||
|
png_uint_16 v;
|
||||||
|
int j;
|
||||||
|
int c = (int)(i%channels);
|
||||||
|
|
||||||
|
v = *bp;
|
||||||
|
*bp = 0;
|
||||||
|
for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
|
||||||
|
{
|
||||||
|
if (j > 0)
|
||||||
|
*bp |= (png_byte)((v << j) & 0xff);
|
||||||
|
else
|
||||||
|
*bp |= (png_byte)((v >> (-j)) & 0xff);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
png_bytep bp;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 istop = channels * row_info->width;
|
||||||
|
|
||||||
|
for (bp = row, i = 0; i < istop; i++)
|
||||||
|
{
|
||||||
|
int c = (int)(i%channels);
|
||||||
|
png_uint_16 value, v;
|
||||||
|
int j;
|
||||||
|
|
||||||
|
v = (png_uint_16)(((png_uint_16)(*bp) << 8) + *(bp + 1));
|
||||||
|
value = 0;
|
||||||
|
for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
|
||||||
|
{
|
||||||
|
if (j > 0)
|
||||||
|
value |= (png_uint_16)((v << j) & (png_uint_16)0xffff);
|
||||||
|
else
|
||||||
|
value |= (png_uint_16)((v >> (-j)) & (png_uint_16)0xffff);
|
||||||
|
}
|
||||||
|
*bp++ = (png_byte)(value >> 8);
|
||||||
|
*bp++ = (png_byte)(value & 0xff);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_write_swap_alpha\n");
|
||||||
|
#if defined(PNG_USELESS_TESTS_SUPPORTED)
|
||||||
|
if (row != NULL && row_info != NULL)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
||||||
|
{
|
||||||
|
/* This converts from ARGB to RGBA */
|
||||||
|
if (row_info->bit_depth == 8)
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
for (i = 0, sp = dp = row; i < row_width; i++)
|
||||||
|
{
|
||||||
|
png_byte save = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = save;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* This converts from AARRGGBB to RRGGBBAA */
|
||||||
|
else
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
|
||||||
|
for (i = 0, sp = dp = row; i < row_width; i++)
|
||||||
|
{
|
||||||
|
png_byte save[2];
|
||||||
|
save[0] = *(sp++);
|
||||||
|
save[1] = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = save[0];
|
||||||
|
*(dp++) = save[1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
||||||
|
{
|
||||||
|
/* This converts from AG to GA */
|
||||||
|
if (row_info->bit_depth == 8)
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
|
||||||
|
for (i = 0, sp = dp = row; i < row_width; i++)
|
||||||
|
{
|
||||||
|
png_byte save = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = save;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* This converts from AAGG to GGAA */
|
||||||
|
else
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
|
||||||
|
for (i = 0, sp = dp = row; i < row_width; i++)
|
||||||
|
{
|
||||||
|
png_byte save[2];
|
||||||
|
save[0] = *(sp++);
|
||||||
|
save[1] = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = save[0];
|
||||||
|
*(dp++) = save[1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_write_invert_alpha\n");
|
||||||
|
#if defined(PNG_USELESS_TESTS_SUPPORTED)
|
||||||
|
if (row != NULL && row_info != NULL)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
||||||
|
{
|
||||||
|
/* This inverts the alpha channel in RGBA */
|
||||||
|
if (row_info->bit_depth == 8)
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
for (i = 0, sp = dp = row; i < row_width; i++)
|
||||||
|
{
|
||||||
|
/* does nothing
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*/
|
||||||
|
sp+=3; dp = sp;
|
||||||
|
*(dp++) = (png_byte)(255 - *(sp++));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* This inverts the alpha channel in RRGGBBAA */
|
||||||
|
else
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
|
||||||
|
for (i = 0, sp = dp = row; i < row_width; i++)
|
||||||
|
{
|
||||||
|
/* does nothing
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*/
|
||||||
|
sp+=6; dp = sp;
|
||||||
|
*(dp++) = (png_byte)(255 - *(sp++));
|
||||||
|
*(dp++) = (png_byte)(255 - *(sp++));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
||||||
|
{
|
||||||
|
/* This inverts the alpha channel in GA */
|
||||||
|
if (row_info->bit_depth == 8)
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
|
||||||
|
for (i = 0, sp = dp = row; i < row_width; i++)
|
||||||
|
{
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = (png_byte)(255 - *(sp++));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* This inverts the alpha channel in GGAA */
|
||||||
|
else
|
||||||
|
{
|
||||||
|
png_bytep sp, dp;
|
||||||
|
png_uint_32 i;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
|
||||||
|
for (i = 0, sp = dp = row; i < row_width; i++)
|
||||||
|
{
|
||||||
|
/* does nothing
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*(dp++) = *(sp++);
|
||||||
|
*/
|
||||||
|
sp+=2; dp = sp;
|
||||||
|
*(dp++) = (png_byte)(255 - *(sp++));
|
||||||
|
*(dp++) = (png_byte)(255 - *(sp++));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PNG_MNG_FEATURES_SUPPORTED)
|
||||||
|
/* undoes intrapixel differencing */
|
||||||
|
void /* PRIVATE */
|
||||||
|
png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
|
||||||
|
{
|
||||||
|
png_debug(1, "in png_do_write_intrapixel\n");
|
||||||
|
if (
|
||||||
|
#if defined(PNG_USELESS_TESTS_SUPPORTED)
|
||||||
|
row != NULL && row_info != NULL &&
|
||||||
|
#endif
|
||||||
|
(row_info->color_type & PNG_COLOR_MASK_COLOR))
|
||||||
|
{
|
||||||
|
int bytes_per_pixel;
|
||||||
|
png_uint_32 row_width = row_info->width;
|
||||||
|
if (row_info->bit_depth == 8)
|
||||||
|
{
|
||||||
|
png_bytep rp;
|
||||||
|
png_uint_32 i;
|
||||||
|
|
||||||
|
if (row_info->color_type == PNG_COLOR_TYPE_RGB)
|
||||||
|
bytes_per_pixel = 3;
|
||||||
|
else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
||||||
|
bytes_per_pixel = 4;
|
||||||
|
else
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
|
||||||
|
{
|
||||||
|
*(rp) = (png_byte)((*rp - *(rp+1))&0xff);
|
||||||
|
*(rp+2) = (png_byte)((*(rp+2) - *(rp+1))&0xff);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (row_info->bit_depth == 16)
|
||||||
|
{
|
||||||
|
png_bytep rp;
|
||||||
|
png_uint_32 i;
|
||||||
|
|
||||||
|
if (row_info->color_type == PNG_COLOR_TYPE_RGB)
|
||||||
|
bytes_per_pixel = 6;
|
||||||
|
else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
||||||
|
bytes_per_pixel = 8;
|
||||||
|
else
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
|
||||||
|
{
|
||||||
|
png_uint_32 s0 = (*(rp ) << 8) | *(rp+1);
|
||||||
|
png_uint_32 s1 = (*(rp+2) << 8) | *(rp+3);
|
||||||
|
png_uint_32 s2 = (*(rp+4) << 8) | *(rp+5);
|
||||||
|
png_uint_32 red = (png_uint_32)((s0-s1) & 0xffffL);
|
||||||
|
png_uint_32 blue = (png_uint_32)((s2-s1) & 0xffffL);
|
||||||
|
*(rp ) = (png_byte)((red >> 8) & 0xff);
|
||||||
|
*(rp+1) = (png_byte)(red & 0xff);
|
||||||
|
*(rp+4) = (png_byte)((blue >> 8) & 0xff);
|
||||||
|
*(rp+5) = (png_byte)(blue & 0xff);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* PNG_MNG_FEATURES_SUPPORTED */
|
||||||
|
#endif /* PNG_WRITE_SUPPORTED */
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue