Skip to content

Commit e78f656

Browse files
pstanczykpstanczyk
committed
Temporarily Turning off the optimisation path and bumping the version
1 parent 3ae0acb commit e78f656

File tree

11 files changed

+57
-26
lines changed

11 files changed

+57
-26
lines changed

‎IlmBase/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Version 2.0.1
2+
* Bumped version to track OpenEXR
3+
(Piotr Stanczyk)
4+
15
Version 2.0.0
26
* Bumped version to track OpenEXR
37
(Piotr Stanczyk)

‎IlmBase/configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
AC_INIT(IlmBase, 2.0.0)
2+
AC_INIT(IlmBase, 2.0.1)
33

44
AC_SUBST(ILMBASE_VERSION_MAJOR, 2)
55
AC_SUBST(ILMBASE_VERSION_MINOR, 0)
6-
AC_SUBST(ILMBASE_VERSION_PATCH, 0)
6+
AC_SUBST(ILMBASE_VERSION_PATCH, 1)
77

88
AC_SUBST(ILMBASE_VERSION, ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH})
99
AC_SUBST(ILMBASE_VERSION_API, ${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR})
@@ -16,7 +16,7 @@ AM_MAINTAINER_MODE
1616

1717

1818
LIBTOOL_CURRENT=10
19-
LIBTOOL_REVISION=0
19+
LIBTOOL_REVISION=1
2020
LIBTOOL_AGE=0
2121
LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
2222
AC_SUBST(LIBTOOL_VERSION)

‎OpenEXR/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 2.0.1
2+
* Temporarily turning off optimisation code path
3+
(Piotr Stanczyk)
4+
* Added additional tests for future optimisation refactoring
5+
(Piotr Stanczyk / Peter Hillman)
6+
17
Version 2.0.0
28
* Updated Documentation
39
(Peter Hillman)

‎OpenEXR/IlmImf/ImfScanLineInputFile.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,8 +1365,8 @@ ScanLineInputFile::setFrameBuffer (const FrameBuffer &frameBuffer)
13651365
_data->optimizationMode = detectOptimizationMode(frameBuffer, channels,v);
13661366
}
13671367

1368-
// TODO-pk this disables optimization
1369-
// _data->optimizationMode._destination._format = Imf::OptimizationMode::PIXELFORMAT_OTHER;
1368+
// Uncomment the line below to disable optimization code path
1369+
_data->optimizationMode._destination._format = Imf::OptimizationMode::PIXELFORMAT_OTHER;
13701370

13711371

13721372
//

‎OpenEXR/IlmImfTest/Makefile.am

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,28 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h testAttributes.cpp testChannels.cpp \
2525
testTiledRgba.h compareFloat.h compareFloat.cpp \
2626
testTiledYa.cpp testTiledYa.h \
2727
testYca.cpp testYca.h compareB44.h compareB44.cpp \
28-
testMultiView.cpp testMultiView.h \
28+
testMultiView.cpp testMultiView.h \
2929
testIsComplete.cpp testIsComplete.h \
3030
testMultiPartApi.cpp testMultiPartApi.h \
3131
testMultiPartThreading.cpp testMultiPartThreading.h \
3232
testMultiScanlinePartThreading.cpp testMultiScanlinePartThreading.h \
3333
testMultiTiledPartThreading.cpp testMultiTiledPartThreading.h \
34-
testDeepScanLineBasic.cpp testDeepScanLineBasic.h \
35-
testDeepTiledBasic.cpp testDeepTiledBasic.h \
34+
testDeepScanLineBasic.cpp testDeepScanLineBasic.h \
35+
testDeepTiledBasic.cpp testDeepTiledBasic.h \
3636
testMultiPartFileMixingBasic.cpp testMultiPartFileMixingBasic.h \
3737
testMultiPartSharedAttributes.cpp testMultiPartSharedAttributes.h \
3838
testBackwardCompatibility.cpp testBackwardCompatibility.h \
39-
testCopyDeepScanLine.cpp testCopyDeepScanLine.h testCopyDeepTiled.h \
40-
testCopyDeepTiled.cpp testCopyMultiPartFile.h testCopyMultiPartFile.cpp \
41-
testCompositeDeepScanLine.h testCompositeDeepScanLine.cpp \
42-
testInputPart.cpp testInputPart.h \
43-
testDeepScanLineMultipleRead.h testDeepScanLineMultipleRead.cpp \
39+
testCopyDeepScanLine.cpp testCopyDeepScanLine.h \
40+
testCopyDeepTiled.cpp testCopyDeepTiled.h \
41+
testCopyMultiPartFile.h testCopyMultiPartFile.cpp \
42+
testCompositeDeepScanLine.h testCompositeDeepScanLine.cpp \
43+
testInputPart.cpp testInputPart.h \
44+
testDeepScanLineMultipleRead.h testDeepScanLineMultipleRead.cpp \
4445
testPartHelper.h testPartHelper.cpp \
4546
testOptimized.cpp testOptimized.h \
46-
testFutureProofing.cpp testFutureProofing.h
47+
testFutureProofing.cpp testFutureProofing.h \
48+
testOptimizedInterleavePatterns.cpp testOptimizedInterleavePatterns.h
49+
4750

4851
AM_CPPFLAGS = -DILM_IMF_TEST_IMAGEDIR=\"$(srcdir)/\"
4952

‎OpenEXR/IlmImfTest/main.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
#include "testCopyMultiPartFile.h"
8383
#include "testPartHelper.h"
8484
#include "testOptimized.h"
85+
#include "testOptimizedInterleavePatterns.h"
8586
#include "testFutureProofing.h"
8687

8788

@@ -125,7 +126,13 @@ main (int argc, char *argv[])
125126
TEST (testScanLineApi,"basic");
126127
TEST (testExistingStreams,"core");
127128
TEST (testStandardAttributes,"core");
129+
#if 0
130+
// Temporarily disabling the optimisation path and this
131+
// associated test.
132+
/// c.f. https://github.com/openexr/openexr/issues/66
128133
TEST (testOptimized,"basic");
134+
#endif
135+
TEST (testOptimizedInterleavePatterns,"basic");
129136
TEST (testYca,"basic");
130137
TEST (testTiledYa,"basic");
131138
TEST (testNativeFormat,"basic");
@@ -165,7 +172,10 @@ main (int argc, char *argv[])
165172
std::stringstream ss;
166173
ss << "ls -lG /proc/" << getpid() << "/fd";
167174

168-
system (ss.str().c_str());
175+
if(system (ss.str().c_str())==-1)
176+
{
177+
std::cout << "failed to run ls\n";
178+
}
169179

170180
std::cout << std::endl;
171181

‎OpenEXR/configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dnl Process this file with autoconf to produce a configure script.
22

3-
AC_INIT(OpenEXR, 2.0.0)
3+
AC_INIT(OpenEXR, 2.0.1)
44

55
AC_SUBST(OPENEXR_VERSION_MAJOR, 2)
66
AC_SUBST(OPENEXR_VERSION_MINOR, 0)
7-
AC_SUBST(OPENEXR_VERSION_PATCH, 0)
7+
AC_SUBST(OPENEXR_VERSION_PATCH, 1)
88

99
AC_SUBST(OPENEXR_VERSION, ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH})
1010
AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
@@ -17,7 +17,7 @@ AM_MAINTAINER_MODE
1717

1818

1919
LIBTOOL_CURRENT=20
20-
LIBTOOL_REVISION=0
20+
LIBTOOL_REVISION=1
2121
LIBTOOL_AGE=0
2222
LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
2323
AC_SUBST(LIBTOOL_VERSION)

‎OpenEXR_Viewers/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Version 2.0.1
2+
* Bumped version to track OpenEXR
3+
(Piotr Stanczyk)
4+
15
Version 1.0.2:
26
* Added a new -L command-line flag to exrdisplay. The flag
37
specifies which layer in a multi-layer or multi-view image

‎OpenEXR_Viewers/configure.ac

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
AC_INIT(OpenEXR_Viewers, 2.0.0)
3-
AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.0.0)
2+
AC_INIT(OpenEXR_Viewers, 2.0.1)
3+
AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.0.1)
44
AC_CANONICAL_HOST
55
AC_CONFIG_SRCDIR(playexr/main.cpp)
66
AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h)
@@ -9,7 +9,7 @@ AM_MAINTAINER_MODE
99

1010

1111
LIBTOOL_CURRENT=6
12-
LIBTOOL_REVISION=0
12+
LIBTOOL_REVISION=1
1313
LIBTOOL_AGE=0
1414
LIBTOOL_VERSION=$LIBTOOL_CURRENT:$LIBTOOL_REVISION:$LIBTOOL_AGE
1515
AC_SUBST(LIBTOOL_VERSION)
@@ -107,7 +107,7 @@ AM_COMPILELINKRUN(
107107
[$OPENEXR_LIBS],[[
108108
#include <stdlib.h>
109109
#include <ImfTestFile.h>
110-
#include <OpenEXRConfig.h>
110+
#include <ImfNamespace.h>
111111
]],
112112
[[OPENEXR_IMF_NAMESPACE::isOpenExrFile("notExist");]],
113113
AC_MSG_RESULT([Compiled and ran OpenEXR test program.]),
@@ -126,7 +126,7 @@ AM_COMPILELINKRUN(
126126
#include <ImfHeader.h>
127127
#include <ImfFrameBuffer.h>
128128
#include <ImathBox.h>
129-
#include <OpenEXRConfig.h>
129+
#include <ImfNamespace.h>
130130
#include <vector>
131131
#include <cstdlib>
132132
using namespace Ctl;

‎PyIlmBase/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Version 2.0.1
2+
* Bumped version to track OpenEXR
3+
(Piotr Stanczyk)
4+
15
Version 2.0.0
26
* Bumped version to track OpenEXR
37
(Piotr Stanczyk)

0 commit comments

Comments
 (0)