FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Wang Rui, "Attached is a fix to the latest PVR plugin to make it compile under

Browse Source 
MSVC. I've added definition to uint_32 and replaced std::max() with
osg::maximum(), because it is not supported by some VisualStudio
versions."
This commit is contained in:
Robert Osfield
2010-11-05 09:12:28 +00:00
parent 2aaf0ed297
commit 1c6e33bc7e
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgPlugins/pvr/ReaderWriterPVR.cpp
View File

@@ -1,5 +1,9 @@
// ReaderWriter for pvr images
#if defined(_MSC_VER)
#include <windows.h>
#endif
#include <osg/Image>
#include <osg/Notify>
@@ -14,7 +18,17 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#if defined(_MSC_VER)
typedef UINT64 uint64_t;
typedef INT64 int64_t;
typedef UINT32 uint32_t;
typedef INT32 int32_t;
typedef UINT16 uint16_t;
typedef UINT8 uint8_t;
#else
#include <stdint.h>
#endif
using namespace osg;
@@ -193,8 +207,8 @@ public:
dataOffset += widthBlocks * heightBlocks * ((blockSize * bpp) / 8);
width = std::max(width >> 1, (uint32_t)1);
height = std::max(height >> 1, (uint32_t)1);
width = osg::maximum(width >> 1, (uint32_t)1);
height = osg::maximum(height >> 1, (uint32_t)1);
}
if(!mipmapdata.empty())