Revision: 45343
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45343
Author: psy-fi
Date: 2012-04-02 13:48:20 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Solve namespace conflicts for ole grumpy MinGW. It seems FLOAT is also defined
in a windef.h header.
Modified Paths:
--------------
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
2012-04-02 12:37:03 UTC (rev 45342)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
2012-04-02 13:48:20 UTC (rev 45343)
@@ -94,7 +94,7 @@
using namespace Imf;
using namespace Imath;
-class Mem_IStream: public IStream
+class Mem_IStream: public Imf::IStream
{
public:
@@ -212,7 +212,7 @@
if (ibuf->planes==32 && channels >= 4)
header.channels().insert ("A", Channel (HALF));
if (write_zbuf) // z we do as float always
- header.channels().insert ("Z", Channel (FLOAT));
+ header.channels().insert ("Z", Channel (Imf::FLOAT));
FrameBuffer frameBuffer;
OutputFile *file = new OutputFile(name, header);
@@ -230,7 +230,7 @@
if (ibuf->planes==32 && channels >= 4)
frameBuffer.insert ("A", Slice (HALF, (char *)
&pixels[0].a, xstride, ystride));
if (write_zbuf)
- frameBuffer.insert ("Z", Slice (FLOAT, (char
*)(ibuf->zbuf_float + (height-1)*width),
+ frameBuffer.insert ("Z", Slice (Imf::FLOAT, (char
*)(ibuf->zbuf_float + (height-1)*width),
sizeof(float), sizeof(float) * -width));
if (ibuf->rect_float) {
float *from;
@@ -316,13 +316,13 @@
openexr_header_compression(&header, ibuf->ftype &
OPENEXR_COMPRESS);
openexr_header_metadata(&header, ibuf);
- header.channels().insert ("R", Channel (FLOAT));
- header.channels().insert ("G", Channel (FLOAT));
- header.channels().insert ("B", Channel (FLOAT));
+ header.channels().insert ("R", Channel (Imf::FLOAT));
+ header.channels().insert ("G", Channel (Imf::FLOAT));
+ header.channels().insert ("B", Channel (Imf::FLOAT));
if (ibuf->planes==32 && channels >= 4)
- header.channels().insert ("A", Channel (FLOAT));
+ header.channels().insert ("A", Channel (Imf::FLOAT));
if (write_zbuf)
- header.channels().insert ("Z", Channel (FLOAT));
+ header.channels().insert ("Z", Channel (Imf::FLOAT));
FrameBuffer frameBuffer;
OutputFile *file = new OutputFile(name, header);
@@ -336,13 +336,13 @@
rect[2]= rect[0]+2;
rect[3]= (channels >= 4)? rect[0]+3:rect[0]; /* red as alpha,
is this needed since alpha isn't written? */
- frameBuffer.insert ("R", Slice (FLOAT, (char *)rect[0],
xstride, ystride));
- frameBuffer.insert ("G", Slice (FLOAT, (char *)rect[1],
xstride, ystride));
- frameBuffer.insert ("B", Slice (FLOAT, (char *)rect[2],
xstride, ystride));
+ frameBuffer.insert ("R", Slice (Imf::FLOAT, (char *)rect[0],
xstride, ystride));
+ frameBuffer.insert ("G", Slice (Imf::FLOAT, (char *)rect[1],
xstride, ystride));
+ frameBuffer.insert ("B", Slice (Imf::FLOAT, (char *)rect[2],
xstride, ystride));
if (ibuf->planes==32 && channels >= 4)
- frameBuffer.insert ("A", Slice (FLOAT, (char
*)rect[3], xstride, ystride));
+ frameBuffer.insert ("A", Slice (Imf::FLOAT, (char
*)rect[3], xstride, ystride));
if (write_zbuf)
- frameBuffer.insert ("Z", Slice (FLOAT, (char *)
(ibuf->zbuf_float + (height-1)*width),
+ frameBuffer.insert ("Z", Slice (Imf::FLOAT, (char *)
(ibuf->zbuf_float + (height-1)*width),
sizeof(float), sizeof(float) * -width));
file->setFrameBuffer (frameBuffer);
file->writePixels (height);
@@ -481,7 +481,7 @@
data->height= height;
for (echan= (ExrChannel *)data->channels.first; echan; echan=
echan->next)
- header.channels().insert (echan->name, Channel (FLOAT));
+ header.channels().insert (echan->name, Channel (Imf::FLOAT));
openexr_header_compression(&header, compress);
// openexr_header_metadata(&header, ibuf); // no imbuf. cant write
@@ -514,7 +514,7 @@
data->mipmap= mipmap;
for (echan= (ExrChannel *)data->channels.first; echan; echan=
echan->next)
- header.channels().insert (echan->name, Channel (FLOAT));
+ header.channels().insert (echan->name, Channel (Imf::FLOAT));
header.setTileDescription (TileDescription (tilex, tiley, (mipmap)?
MIPMAP_LEVELS: ONE_LEVEL));
header.lineOrder() = RANDOM_Y;
@@ -591,7 +591,7 @@
for (echan= (ExrChannel *)data->channels.first; echan; echan=
echan->next) {
float *rect= echan->rect - echan->xstride*partx -
echan->ystride*party;
- frameBuffer.insert (echan->name, Slice (FLOAT, (char *)rect,
+ frameBuffer.insert (echan->name, Slice (Imf::FLOAT, (char
*)rect,
echan->xstride*sizeof(float), echan->ystride*sizeof(float)));
}
@@ -617,7 +617,7 @@
/* last scanline, stride negative */
float *rect = echan->rect +
echan->xstride*(data->height-1)*data->width;
- frameBuffer.insert (echan->name, Slice (FLOAT, (char
*)rect,
+ frameBuffer.insert (echan->name, Slice (Imf::FLOAT,
(char *)rect,
echan->xstride*sizeof(float),
-echan->ystride*sizeof(float)));
}
@@ -648,10 +648,10 @@
if (echan->rect) {
if (flip)
- frameBuffer.insert (echan->name, Slice (FLOAT,
(char *)echan->rect,
+ frameBuffer.insert (echan->name, Slice
(Imf::FLOAT, (char *)echan->rect,
echan->xstride*sizeof(float), echan->ystride*sizeof(float)));
else
- frameBuffer.insert (echan->name, Slice (FLOAT,
(char *)(echan->rect + echan->xstride*(data->height-1)*data->width),
+ frameBuffer.insert (echan->name, Slice
(Imf::FLOAT, (char *)(echan->rect +
echan->xstride*(data->height-1)*data->width),
echan->xstride*sizeof(float), -echan->ystride*sizeof(float)));
}
else
@@ -1018,14 +1018,14 @@
first+= 4*(height-1)*width;
frameBuffer.insert (
exr_rgba_channelname(file, "R"),
-
Slice (FLOAT, (char *) first, xstride, ystride));
+
Slice (Imf::FLOAT, (char *) first, xstride, ystride));
frameBuffer.insert (
exr_rgba_channelname(file, "G"),
-
Slice (FLOAT, (char *) (first+1), xstride, ystride));
+
Slice (Imf::FLOAT, (char *) (first+1), xstride, ystride));
frameBuffer.insert (
exr_rgba_channelname(file, "B"),
-
Slice (FLOAT, (char *) (first+2), xstride, ystride));
+
Slice (Imf::FLOAT, (char *) (first+2), xstride, ystride));
frameBuffer.insert (
exr_rgba_channelname(file, "A"),
-
Slice (FLOAT, (char *) (first+3), xstride, ystride, 1, 1, 1.0f)); /* 1.0 is
fill value */
+
Slice (Imf::FLOAT, (char *) (first+3), xstride, ystride, 1, 1, 1.0f)); /* 1.0
is fill value */
if (exr_has_zbuffer(file))
{
@@ -1034,7 +1034,7 @@
addzbuffloatImBuf(ibuf);
firstz= ibuf->zbuf_float -
(dw.min.x - dw.min.y*width);
firstz+= (height-1)*width;
- frameBuffer.insert ("Z", Slice
(FLOAT, (char *)firstz , sizeof(float), -width*sizeof(float)));
+ frameBuffer.insert ("Z", Slice
(Imf::FLOAT, (char *)firstz , sizeof(float), -width*sizeof(float)));
}
file->setFrameBuffer (frameBuffer);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
