Patches for CMAKE and compiling on windows
Gonzalo Garramuño <[email protected]>
| Newsgroups | gmane.comp.video.openexr.devel |
|---|---|
| Message-ID | <[email protected]> |
_______________________________________________ Openexr-devel mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/openexr-devel
patch.txt
(text/plain, 11.7 KB)
diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt
index 3b97d7e..a28dac0 100644
--- a/IlmBase/Half/CMakeLists.txt
+++ b/IlmBase/Half/CMakeLists.txt
@@ -48,6 +48,7 @@ INSTALL ( TARGETS
INSTALL ( FILES
half.h
halfFunction.h
+ halfExport.h
halfLimits.h
DESTINATION
include/OpenEXR
diff --git a/IlmBase/vc/vc9/IlmBase/IlmBase.sln b/IlmBase/vc/vc9/IlmBase/IlmBase.sln
index bb0abd9..7a23ee3 100755
--- a/IlmBase/vc/vc9/IlmBase/IlmBase.sln
+++ b/IlmBase/vc/vc9/IlmBase/IlmBase.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Half", "Half\Half.vcproj", "{9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}"
ProjectSection(ProjectDependencies) = postProject
{10BEB970-1565-4944-8768-81BD05DD0A3A} = {10BEB970-1565-4944-8768-81BD05DD0A3A}
diff --git a/OpenEXR/IlmImfFuzzTest/CMakeLists.txt b/OpenEXR/IlmImfFuzzTest/CMakeLists.txt
index ea88b30..b80e633 100644
--- a/OpenEXR/IlmImfFuzzTest/CMakeLists.txt
+++ b/OpenEXR/IlmImfFuzzTest/CMakeLists.txt
@@ -5,6 +5,8 @@ ADD_EXECUTABLE ( IlmImfFuzzTest
main.cpp
testFuzzScanLines.cpp
testFuzzTiles.cpp
+ testFuzzDeepTiles.cpp
+ testFuzzDeepScanLines.cpp
)
TARGET_LINK_LIBRARIES ( IlmImfFuzzTest IlmImf Iex Imath Half IlmThread ${PTHREAD_LIB} ${Z_LIB})
diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzDeepScanLines.cpp b/OpenEXR/IlmImfFuzzTest/testFuzzDeepScanLines.cpp
index 56e1f61..9d26e68 100644
--- a/OpenEXR/IlmImfFuzzTest/testFuzzDeepScanLines.cpp
+++ b/OpenEXR/IlmImfFuzzTest/testFuzzDeepScanLines.cpp
@@ -97,7 +97,7 @@ void generateRandomFile(const char filename[], int channelCount,int parts , Comp
stringstream ss;
ss << i;
string str = ss.str();
- headers[0].channels().insert(str, Channel(FLOAT));
+ headers[0].channels().insert(str, Channel(OPENEXR_IMF_NAMESPACE::FLOAT));
}
headers[0].setType(DEEPSCANLINE);
@@ -126,7 +126,7 @@ void generateRandomFile(const char filename[], int channelCount,int parts , Comp
DeepFrameBuffer frameBuffer;
- frameBuffer.insertSampleCountSlice (Slice (UINT, // type // 7
+ frameBuffer.insertSampleCountSlice (Slice (OPENEXR_IMF_NAMESPACE::UINT, // type // 7
(char *) (&sampleCount[0][0]
- dataWindow.min.x
- dataWindow.min.y * width), // base // 8
@@ -135,7 +135,7 @@ void generateRandomFile(const char filename[], int channelCount,int parts , Comp
for (int i = 0; i < channelCount; i++)
{
- PixelType type=FLOAT;
+ PixelType type=OPENEXR_IMF_NAMESPACE::FLOAT;
stringstream ss;
ss << i;
string str = ss.str();
@@ -208,7 +208,7 @@ void readFile(const char filename[])
DeepFrameBuffer frameBuffer;
- frameBuffer.insertSampleCountSlice (Slice (UINT, // type // 7
+ frameBuffer.insertSampleCountSlice (Slice (OPENEXR_IMF_NAMESPACE::UINT, // type // 7
(char *) (&localSampleCount[0][0]
- dataWindow.min.x
- dataWindow.min.y * width), // base // 8)
@@ -220,7 +220,7 @@ void readFile(const char filename[])
for (int i = 0; i < channelCount; i++)
{
- PixelType type = FLOAT;
+ PixelType type = OPENEXR_IMF_NAMESPACE::FLOAT;
stringstream ss;
ss << i;
@@ -301,7 +301,7 @@ void readFile(const char filename[])
DeepFrameBuffer frameBuffer;
- frameBuffer.insertSampleCountSlice (Slice (UINT, // type // 7
+ frameBuffer.insertSampleCountSlice (Slice (OPENEXR_IMF_NAMESPACE::UINT, // type // 7
(char *) (&localSampleCount[0][0]
- dataWindow.min.x
- dataWindow.min.y * width), // base // 8)
@@ -313,7 +313,7 @@ void readFile(const char filename[])
for (int i = 0; i < channelCount; i++)
{
- PixelType type = FLOAT;
+ PixelType type = OPENEXR_IMF_NAMESPACE::FLOAT;
stringstream ss;
ss << i;
diff --git a/OpenEXR/IlmImfFuzzTest/testFuzzDeepTiles.cpp b/OpenEXR/IlmImfFuzzTest/testFuzzDeepTiles.cpp
index 690fe90..c848307 100644
--- a/OpenEXR/IlmImfFuzzTest/testFuzzDeepTiles.cpp
+++ b/OpenEXR/IlmImfFuzzTest/testFuzzDeepTiles.cpp
@@ -161,7 +161,7 @@ void generateRandomFile(const char filename[], int channelCount, int parts , Com
int pointerSize = sizeof (char *);
frameBuffer.insert (str,
- DeepSlice (FLOAT,
+ DeepSlice (OPENEXR_IMF_NAMESPACE::FLOAT,
(char *) (&data[i][0][0] - memOffset),
pointerSize * 1,
pointerSize * width,
@@ -278,7 +278,7 @@ void readFile(const char filename[])
int pointerSize = sizeof (char *);
frameBuffer.insert (str,
- DeepSlice (FLOAT,
+ DeepSlice (OPENEXR_IMF_NAMESPACE::FLOAT,
(char *) (&data[i][0][0] - memOffset),
pointerSize * 1,
pointerSize * width,
@@ -391,7 +391,7 @@ void readFile(const char filename[])
int pointerSize = sizeof (char *);
frameBuffer.insert (str,
- DeepSlice (FLOAT,
+ DeepSlice (OPENEXR_IMF_NAMESPACE::FLOAT,
(char *) (&data[i][0][0] - memOffset),
pointerSize * 1,
pointerSize * width,
diff --git a/OpenEXR/IlmImfTest/CMakeLists.txt b/OpenEXR/IlmImfTest/CMakeLists.txt
index e867be9..5de3d99 100644
--- a/OpenEXR/IlmImfTest/CMakeLists.txt
+++ b/OpenEXR/IlmImfTest/CMakeLists.txt
@@ -7,6 +7,7 @@ ADD_EXECUTABLE ( IlmImfTest
compareFloat.cpp
main.cpp
testAttributes.cpp
+ testBadTypeAttributes.cpp
testBackwardCompatibility.cpp
testChannels.cpp
testCompositeDeepScanLine.cpp
@@ -19,8 +20,10 @@ ADD_EXECUTABLE ( IlmImfTest
testCustomAttributes.cpp
testDeepScanLineBasic.cpp
testDeepScanLineHuge.cpp
+ testDeepScanLineMultipleRead.cpp
testDeepTiledBasic.cpp
testExistingStreams.cpp
+ testFutureProofing.cpp
testHuf.cpp
testInputPart.cpp
testIsComplete.cpp
@@ -35,6 +38,8 @@ ADD_EXECUTABLE ( IlmImfTest
testMultiTiledPartThreading.cpp
testMultiView.cpp
testNativeFormat.cpp
+ testOptimizedInterleavePatterns.cpp
+ testPartHelper.cpp
testPreviewImage.cpp
testRgba.cpp
testRgbaThreading.cpp
diff --git a/OpenEXR/IlmImfTest/testOptimizedInterleavePatterns.cpp b/OpenEXR/IlmImfTest/testOptimizedInterleavePatterns.cpp
index 369d358..2c327eb 100644
--- a/OpenEXR/IlmImfTest/testOptimizedInterleavePatterns.cpp
+++ b/OpenEXR/IlmImfTest/testOptimizedInterleavePatterns.cpp
@@ -115,9 +115,9 @@ const char * lefthero[] = {"left","right",NULL};
const char * righthero[] = {"right","left",NULL};
const char * centrehero[] = {"centre","left","right",NULL};
-const PixelType four_floats[] = {FLOAT,FLOAT,FLOAT,FLOAT};
-const PixelType hhhfff[] = {HALF,HALF,HALF,FLOAT,FLOAT,FLOAT};
-const PixelType hhhhffff[] = {HALF,HALF,HALF,HALF,FLOAT,FLOAT,FLOAT,FLOAT};
+const PixelType four_floats[] = {OPENEXR_IMF_NAMESPACE::FLOAT,OPENEXR_IMF_NAMESPACE::FLOAT,OPENEXR_IMF_NAMESPACE::FLOAT,OPENEXR_IMF_NAMESPACE::FLOAT};
+const PixelType hhhfff[] = {OPENEXR_IMF_NAMESPACE::HALF,OPENEXR_IMF_NAMESPACE::HALF,OPENEXR_IMF_NAMESPACE::HALF,OPENEXR_IMF_NAMESPACE::FLOAT,OPENEXR_IMF_NAMESPACE::FLOAT,OPENEXR_IMF_NAMESPACE::FLOAT};
+const PixelType hhhhffff[] = {OPENEXR_IMF_NAMESPACE::HALF,OPENEXR_IMF_NAMESPACE::HALF,OPENEXR_IMF_NAMESPACE::HALF,OPENEXR_IMF_NAMESPACE::HALF,OPENEXR_IMF_NAMESPACE::FLOAT,OPENEXR_IMF_NAMESPACE::FLOAT,OPENEXR_IMF_NAMESPACE::FLOAT,OPENEXR_IMF_NAMESPACE::FLOAT};
Schema Schemes[] = {
{"RGBHalf" ,rgb ,NULL,1,NULL ,NULL},
@@ -183,13 +183,13 @@ bool compare(const FrameBuffer& asRead,
half readHalf;
switch(i.slice().type)
{
- case FLOAT :
+ case OPENEXR_IMF_NAMESPACE::FLOAT :
readHalf = half(*(float*) ptr);
break;
- case HALF :
+ case OPENEXR_IMF_NAMESPACE::HALF :
readHalf = half(*(half*) ptr);
break;
- case UINT :
+ case OPENEXR_IMF_NAMESPACE::UINT :
continue; // can't very well check this
default :
cout << "don't know about that\n";
@@ -204,13 +204,13 @@ bool compare(const FrameBuffer& asRead,
p.slice().xStride*x;
switch (p.slice().type)
{
- case FLOAT :
+ case OPENEXR_IMF_NAMESPACE::FLOAT :
writtenHalf = half(*(float*) ptr);
break;
- case HALF :
+ case OPENEXR_IMF_NAMESPACE::HALF :
writtenHalf = half(*(half*) ptr);
break;
- case UINT :
+ case OPENEXR_IMF_NAMESPACE::UINT :
continue;
default :
cout << "don't know about that\n";
@@ -269,8 +269,8 @@ ChannelList setupBuffer(const Header& hdr, // header to grab datawindow fr
}else{
switch(pt[activechans])
{
- case HALF : bytes_per_pixel+=2;break;
- case FLOAT : case UINT : bytes_per_pixel+=4;break;
+ case OPENEXR_IMF_NAMESPACE::HALF : bytes_per_pixel+=2;break;
+ case OPENEXR_IMF_NAMESPACE::FLOAT : case OPENEXR_IMF_NAMESPACE::UINT : bytes_per_pixel+=4;break;
default :
cout << "wot?\n";
exit(1);
@@ -289,8 +289,8 @@ ChannelList setupBuffer(const Header& hdr, // header to grab datawindow fr
}else{
switch(pt[passivechans+activechans])
{
- case HALF : bytes_per_pixel+=2;break;
- case FLOAT : case UINT : bytes_per_pixel+=4;break;
+ case OPENEXR_IMF_NAMESPACE::HALF : bytes_per_pixel+=2;break;
+ case OPENEXR_IMF_NAMESPACE::FLOAT : case OPENEXR_IMF_NAMESPACE::UINT : bytes_per_pixel+=4;break;
default :
cout << "wot?\n";
exit(1);
@@ -398,10 +398,10 @@ ChannelList setupBuffer(const Header& hdr, // header to grab datawindow fr
}
switch (type)
{
- case HALF :
+ case OPENEXR_IMF_NAMESPACE::HALF :
offset+=2;
break;
- case FLOAT :
+ case OPENEXR_IMF_NAMESPACE::FLOAT :
offset+=4;
break;
default :