Commit: 361ed81048e5b66e8d2f32e177965ecedea56b77
Author: Dalai Felinto
Date: Wed Jun 11 03:26:57 2014 -0300
https://developer.blender.org/rB361ed81048e5b66e8d2f32e177965ecedea56b77
Merge remote-tracking branch 'upstream/master' into multiview
Conflicts:
source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
===================================================================
diff --cc source/blender/imbuf/intern/openexr/openexr_api.cpp
index e218198,2dca311..9678d82
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@@ -1617,20 -1124,41 +1617,41 @@@ static const char *exr_rgba_channelname
return chan;
}
-static bool exr_has_rgb(InputFile *file)
++static bool exr_has_rgb(MultiPartInputFile *file)
+ {
- return file->header().channels().findChannel("R") != NULL &&
- file->header().channels().findChannel("G") != NULL &&
- file->header().channels().findChannel("B") != NULL;
++ return file->header(0).channels().findChannel("R") != NULL &&
++ file->header(0).channels().findChannel("G") != NULL &&
++ file->header(0).channels().findChannel("B") != NULL;
+ }
+
-static bool exr_has_luma(InputFile *file)
++static bool exr_has_luma(MultiPartInputFile *file)
+ {
+ /* Y channel is the luma and should always present fir luma space
images,
+ * optionally it could be also channels for chromas called BY and RY.
+ */
- return file->header().channels().findChannel("Y") != NULL;
++ return file->header(0).channels().findChannel("Y") != NULL;
+ }
+
-static bool exr_has_chroma(InputFile *file)
++static bool exr_has_chroma(MultiPartInputFile *file)
+ {
- return file->header().channels().findChannel("BY") != NULL &&
- file->header().channels().findChannel("RY") != NULL;
++ return file->header(0).channels().findChannel("BY") != NULL &&
++ file->header(0).channels().findChannel("RY") != NULL;
+ }
+
-static int exr_has_zbuffer(InputFile *file)
+static int exr_has_zbuffer(MultiPartInputFile *file)
{
- return !(file->header().channels().findChannel("Z") == NULL);
+ return !(file->header(0).channels().findChannel("Z") == NULL);
}
-static int exr_has_alpha(InputFile *file)
+static int exr_has_alpha(MultiPartInputFile *file)
{
- return !(file->header().channels().findChannel("A") == NULL);
+ return !(file->header(0).channels().findChannel("A") == NULL);
}
-static bool exr_is_multilayer(InputFile *file)
+static bool exr_is_multilayer(MultiPartInputFile *file)
{
- const StringAttribute *comments =
file->header().findTypedAttribute<StringAttribute>("BlenderMultiChannel");
- const ChannelList &channels = file->header().channels();
+ const StringAttribute *comments =
file->header(0).findTypedAttribute<StringAttribute>("BlenderMultiChannel");
+ const ChannelList &channels = file->header(0).channels();
std::set <std::string> layerNames;
/* will not include empty layer names */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
