Fixed compilation error on widows

Was caused by mixing up own C-API typedefs with OCIO's

1 files changed, 64 insertions, 66 deletions

diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc
index 4badcc54ebd..44c02d1442b 100644
--- a/intern/opencolorio/fallback_impl.cc
+++ b/intern/opencolorio/fallback_impl.cc
@@ -28,20 +28,18 @@
 #include "MEM_guardedalloc.h"
 #include "BLI_math_color.h"
 
-namespace OCIO_NAMESPACE {};
-
 #include "ocio_impl.h"
 
-#define CONFIG_DEFAULT           ((ConstConfigRcPtr*)1)
+#define CONFIG_DEFAULT           ((OCIO_ConstConfigRcPtr*)1)
 
-#define PROCESSOR_LINEAR_TO_SRGB ((ConstProcessorRcPtr*)1)
-#define PROCESSOR_SRGB_TO_LINEAR ((ConstProcessorRcPtr*)2)
-#define PROCESSOR_UNKNOWN        ((ConstProcessorRcPtr*)3)
+#define PROCESSOR_LINEAR_TO_SRGB ((OCIO_ConstProcessorRcPtr*)1)
+#define PROCESSOR_SRGB_TO_LINEAR ((OCIO_ConstProcessorRcPtr*)2)
+#define PROCESSOR_UNKNOWN        ((OCIO_ConstProcessorRcPtr*)3)
 
-#define COLORSPACE_LINEAR        ((ConstColorSpaceRcPtr*)1)
-#define COLORSPACE_SRGB          ((ConstColorSpaceRcPtr*)2)
+#define COLORSPACE_LINEAR        ((OCIO_ConstColorSpaceRcPtr*)1)
+#define COLORSPACE_SRGB          ((OCIO_ConstColorSpaceRcPtr*)2)
 
-typedef struct PackedImageDescription {
+typedef struct OCIO_PackedImageDescription {
 	float *data;
 	long width;
 	long height;
@@ -49,37 +47,37 @@ typedef struct PackedImageDescription {
 	long chanStrideBytes;
 	long xStrideBytes;
 	long yStrideBytes;
-} PackedImageDescription;
+} OCIO_PackedImageDescription;
 
-ConstConfigRcPtr *FallbackImpl::getCurrentConfig(void)
+OCIO_ConstConfigRcPtr *FallbackImpl::getCurrentConfig(void)
 {
 	return CONFIG_DEFAULT;
 }
 
-void FallbackImpl::setCurrentConfig(const ConstConfigRcPtr *)
+void FallbackImpl::setCurrentConfig(const OCIO_ConstConfigRcPtr *)
 {
 }
 
-ConstConfigRcPtr *FallbackImpl::configCreateFromEnv(void)
+OCIO_ConstConfigRcPtr *FallbackImpl::configCreateFromEnv(void)
 {
 	return CONFIG_DEFAULT;
 }
 
-ConstConfigRcPtr *FallbackImpl::configCreateFromFile(const char *)
+OCIO_ConstConfigRcPtr *FallbackImpl::configCreateFromFile(const char *)
 {
 	return CONFIG_DEFAULT;
 }
 
-void FallbackImpl::configRelease(ConstConfigRcPtr *)
+void FallbackImpl::configRelease(OCIO_ConstConfigRcPtr *)
 {
 }
 
-int FallbackImpl::configGetNumColorSpaces(ConstConfigRcPtr *)
+int FallbackImpl::configGetNumColorSpaces(OCIO_ConstConfigRcPtr *)
 {
 	return 2;
 }
 
-const char *FallbackImpl::configGetColorSpaceNameByIndex(ConstConfigRcPtr *, int index)
+const char *FallbackImpl::configGetColorSpaceNameByIndex(OCIO_ConstConfigRcPtr *, int index)
 {
 	if (index == 0)
 		return "Linear";
@@ -89,7 +87,7 @@ const char *FallbackImpl::configGetColorSpaceNameByIndex(ConstConfigRcPtr *, int
 	return NULL;
 }
 
-ConstColorSpaceRcPtr *FallbackImpl::configGetColorSpace(ConstConfigRcPtr *, const char *name)
+OCIO_ConstColorSpaceRcPtr *FallbackImpl::configGetColorSpace(OCIO_ConstConfigRcPtr *, const char *name)
 {
 	if (strcmp(name, "scene_linear") == 0)
 		return COLORSPACE_LINEAR;
@@ -111,9 +109,9 @@ ConstColorSpaceRcPtr *FallbackImpl::configGetColorSpace(ConstConfigRcPtr *, cons
 	return NULL;
 }
 
-int FallbackImpl::configGetIndexForColorSpace(ConstConfigRcPtr *config, const char *name)
+int FallbackImpl::configGetIndexForColorSpace(OCIO_ConstConfigRcPtr *config, const char *name)
 {
-	ConstColorSpaceRcPtr *cs = configGetColorSpace(config, name);
+	OCIO_ConstColorSpaceRcPtr *cs = configGetColorSpace(config, name);
 
 	if (cs == COLORSPACE_LINEAR)
 		return 0;
@@ -123,17 +121,17 @@ int FallbackImpl::configGetIndexForColorSpace(ConstConfigRcPtr *config, const ch
 	return -1;
 }
 
-const char *FallbackImpl::configGetDefaultDisplay(ConstConfigRcPtr *)
+const char *FallbackImpl::configGetDefaultDisplay(OCIO_ConstConfigRcPtr *)
 {
 	return "sRGB";
 }
 
-int FallbackImpl::configGetNumDisplays(ConstConfigRcPtr* config)
+int FallbackImpl::configGetNumDisplays(OCIO_ConstConfigRcPtr* config)
 {
 	return 1;
 }
 
-const char *FallbackImpl::configGetDisplay(ConstConfigRcPtr *, int index)
+const char *FallbackImpl::configGetDisplay(OCIO_ConstConfigRcPtr *, int index)
 {
 	if (index == 0)
 		return "sRGB";
@@ -141,17 +139,17 @@ const char *FallbackImpl::configGetDisplay(ConstConfigRcPtr *, int index)
 	return NULL;
 }
 
-const char *FallbackImpl::configGetDefaultView(ConstConfigRcPtr *, const char *)
+const char *FallbackImpl::configGetDefaultView(OCIO_ConstConfigRcPtr *, const char *)
 {
 	return "Default";
 }
 
-int FallbackImpl::configGetNumViews(ConstConfigRcPtr *, const char *)
+int FallbackImpl::configGetNumViews(OCIO_ConstConfigRcPtr *, const char *)
 {
 	return 1;
 }
 
-const char *FallbackImpl::configGetView(ConstConfigRcPtr *, const char *, int index)
+const char *FallbackImpl::configGetView(OCIO_ConstConfigRcPtr *, const char *, int index)
 {
 	if (index == 0)
 		return "Default";
@@ -159,29 +157,29 @@ const char *FallbackImpl::configGetView(ConstConfigRcPtr *, const char *, int in
 	return NULL;
 }
 
-const char *FallbackImpl::configGetDisplayColorSpaceName(ConstConfigRcPtr *, const char *, const char *)
+const char *FallbackImpl::configGetDisplayColorSpaceName(OCIO_ConstConfigRcPtr *, const char *, const char *)
 {
 	return "sRGB";
 }
 
-int FallbackImpl::colorSpaceIsInvertible(ConstColorSpaceRcPtr *cs)
+int FallbackImpl::colorSpaceIsInvertible(OCIO_ConstColorSpaceRcPtr *cs)
 {
 	return 1;
 }
 
-int FallbackImpl::colorSpaceIsData(ConstColorSpaceRcPtr *cs)
+int FallbackImpl::colorSpaceIsData(OCIO_ConstColorSpaceRcPtr *cs)
 {
 	return 0;
 }
 
-void FallbackImpl::colorSpaceRelease(ConstColorSpaceRcPtr *cs)
+void FallbackImpl::colorSpaceRelease(OCIO_ConstColorSpaceRcPtr *cs)
 {
 }
 
-ConstProcessorRcPtr *FallbackImpl::configGetProcessorWithNames(ConstConfigRcPtr *config, const char *srcName, const char *dstName)
+OCIO_ConstProcessorRcPtr *FallbackImpl::configGetProcessorWithNames(OCIO_ConstConfigRcPtr *config, const char *srcName, const char *dstName)
 {
-	ConstColorSpaceRcPtr *cs_src = configGetColorSpace(config, srcName);
-	ConstColorSpaceRcPtr *cs_dst = configGetColorSpace(config, dstName);
+	OCIO_ConstColorSpaceRcPtr *cs_src = configGetColorSpace(config, srcName);
+	OCIO_ConstColorSpaceRcPtr *cs_dst = configGetColorSpace(config, dstName);
 
 	if (cs_src == COLORSPACE_LINEAR && cs_dst == COLORSPACE_SRGB)
 		return PROCESSOR_LINEAR_TO_SRGB;
@@ -191,15 +189,15 @@ ConstProcessorRcPtr *FallbackImpl::configGetProcessorWithNames(ConstConfigRcPtr
 	return 0;
 }
 
-ConstProcessorRcPtr *FallbackImpl::configGetProcessor(ConstConfigRcPtr *, ConstTransformRcPtr *tfm)
+OCIO_ConstProcessorRcPtr *FallbackImpl::configGetProcessor(OCIO_ConstConfigRcPtr *, OCIO_ConstTransformRcPtr *tfm)
 {
-	return (ConstProcessorRcPtr*)tfm;
+	return (OCIO_ConstProcessorRcPtr*)tfm;
 }
 
-void FallbackImpl::processorApply(ConstProcessorRcPtr *processor, PackedImageDesc *img)
+void FallbackImpl::processorApply(OCIO_ConstProcessorRcPtr *processor, OCIO_PackedImageDesc *img)
 {
 	/* OCIO_TODO stride not respected, channels must be 3 or 4 */
-	PackedImageDescription *desc = (PackedImageDescription*)img;
+	OCIO_PackedImageDescription *desc = (OCIO_PackedImageDescription*)img;
 	int channels = desc->numChannels;
 	float *pixels = desc->data;
 	int width = desc->width;
@@ -218,10 +216,10 @@ void FallbackImpl::processorApply(ConstProcessorRcPtr *processor, PackedImageDes
 	}
 }
 
-void FallbackImpl::processorApply_predivide(ConstProcessorRcPtr *processor, PackedImageDesc *img)
+void FallbackImpl::processorApply_predivide(OCIO_ConstProcessorRcPtr *processor, OCIO_PackedImageDesc *img)
 {
 	/* OCIO_TODO stride not respected, channels must be 3 or 4 */
-	PackedImageDescription *desc = (PackedImageDescription*)img;
+	OCIO_PackedImageDescription *desc = (OCIO_PackedImageDescription*)img;
 	int channels = desc->numChannels;
 	float *pixels = desc->data;
 	int width = desc->width;
@@ -240,7 +238,7 @@ void FallbackImpl::processorApply_predivide(ConstProcessorRcPtr *processor, Pack
 	}
 }
 
-void FallbackImpl::processorApplyRGB(ConstProcessorRcPtr *processor, float *pixel)
+void FallbackImpl::processorApplyRGB(OCIO_ConstProcessorRcPtr *processor, float *pixel)
 {
 	if (processor == PROCESSOR_LINEAR_TO_SRGB)
 		linearrgb_to_srgb_v3_v3(pixel, pixel);
@@ -248,7 +246,7 @@ void FallbackImpl::processorApplyRGB(ConstProcessorRcPtr *processor, float *pixe
 		srgb_to_linearrgb_v3_v3(pixel, pixel);
 }
 
-void FallbackImpl::processorApplyRGBA(ConstProcessorRcPtr *processor, float *pixel)
+void FallbackImpl::processorApplyRGBA(OCIO_ConstProcessorRcPtr *processor, float *pixel)
 {
 	if (processor == PROCESSOR_LINEAR_TO_SRGB)
 		linearrgb_to_srgb_v4(pixel, pixel);
@@ -256,7 +254,7 @@ void FallbackImpl::processorApplyRGBA(ConstProcessorRcPtr *processor, float *pix
 		srgb_to_linearrgb_v4(pixel, pixel);
 }
 
-void FallbackImpl::processorApplyRGBA_predivide(ConstProcessorRcPtr *processor, float *pixel)
+void FallbackImpl::processorApplyRGBA_predivide(OCIO_ConstProcessorRcPtr *processor, float *pixel)
 {
 	if (pixel[3] == 1.0f || pixel[3] == 0.0f) {
 		processorApplyRGBA(processor, pixel);
@@ -279,11 +277,11 @@ void FallbackImpl::processorApplyRGBA_predivide(ConstProcessorRcPtr *processor,
 	}
 }
 
-void FallbackImpl::processorRelease(ConstProcessorRcPtr *)
+void FallbackImpl::processorRelease(OCIO_ConstProcessorRcPtr *)
 {
 }
 
-const char *FallbackImpl::colorSpaceGetName(ConstColorSpaceRcPtr *cs)
+const char *FallbackImpl::colorSpaceGetName(OCIO_ConstColorSpaceRcPtr *cs)
 {
 	if (cs == COLORSPACE_LINEAR)
 		return "Linear";
@@ -293,49 +291,49 @@ const char *FallbackImpl::colorSpaceGetName(ConstColorSpaceRcPtr *cs)
 	return NULL;
 }
 
-const char *FallbackImpl::colorSpaceGetDescription(ConstColorSpaceRcPtr *)
+const char *FallbackImpl::colorSpaceGetDescription(OCIO_ConstColorSpaceRcPtr *)
 {
 	return "";
 }
 
-const char *FallbackImpl::colorSpaceGetFamily(ConstColorSpaceRcPtr *)
+const char *FallbackImpl::colorSpaceGetFamily(OCIO_ConstColorSpaceRcPtr *)
 {
 	return "";
 }
 
-DisplayTransformRcPtr *FallbackImpl::createDisplayTransform(void)
+OCIO_DisplayTransformRcPtr *FallbackImpl::createDisplayTransform(void)
 {
-	return (DisplayTransformRcPtr*)PROCESSOR_LINEAR_TO_SRGB;
+	return (OCIO_DisplayTransformRcPtr*)PROCESSOR_LINEAR_TO_SRGB;
 }
 
-void FallbackImpl::displayTransformSetInputColorSpaceName(DisplayTransformRcPtr *, const char *)
+void FallbackImpl::displayTransformSetInputColorSpaceName(OCIO_DisplayTransformRcPtr *, const char *)
 {
 }
 
-void FallbackImpl::displayTransformSetDisplay(DisplayTransformRcPtr *, const char *)
+void FallbackImpl::displayTransformSetDisplay(OCIO_DisplayTransformRcPtr *, const char *)
 {
 }
 
-void FallbackImpl::displayTransformSetView(DisplayTransformRcPtr *, const char *)
+void FallbackImpl::displayTransformSetView(OCIO_DisplayTransformRcPtr *, const char *)
 {
 }
 
-void FallbackImpl::displayTransformSetDisplayCC(DisplayTransformRcPtr *, ConstTransformRcPtr *)
+void FallbackImpl::displayTransformSetDisplayCC(OCIO_DisplayTransformRcPtr *, OCIO_ConstTransformRcPtr *)
 {
 }
 
-void FallbackImpl::displayTransformSetLinearCC(DisplayTransformRcPtr *, ConstTransformRcPtr *)
+void FallbackImpl::displayTransformSetLinearCC(OCIO_DisplayTransformRcPtr *, OCIO_ConstTransformRcPtr *)
 {
 }
 
-void FallbackImpl::displayTransformRelease(DisplayTransformRcPtr *)
+void FallbackImpl::displayTransformRelease(OCIO_DisplayTransformRcPtr *)
 {
 }
 
-PackedImageDesc *FallbackImpl::createPackedImageDesc(float *data, long width, long height, long numChannels,
+OCIO_PackedImageDesc *FallbackImpl::createOCIO_PackedImageDesc(float *data, long width, long height, long numChannels,
                                                      long chanStrideBytes, long xStrideBytes, long yStrideBytes)
 {
-	PackedImageDescription *desc = (PackedImageDescription*)MEM_callocN(sizeof(PackedImageDescription), "PackedImageDescription");
+	OCIO_PackedImageDescription *desc = (OCIO_PackedImageDescription*)MEM_callocN(sizeof(OCIO_PackedImageDescription), "OCIO_PackedImageDescription");
 
 	desc->data = data;
 	desc->width = width;
@@ -345,37 +343,37 @@ PackedImageDesc *FallbackImpl::createPackedImageDesc(float *data, long width, lo
 	desc->xStrideBytes = xStrideBytes;
 	desc->yStrideBytes = yStrideBytes;
 
-	return (PackedImageDesc*)desc;
+	return (OCIO_PackedImageDesc*)desc;
 }
 
-void FallbackImpl::packedImageDescRelease(PackedImageDesc* id)
+void FallbackImpl::OCIO_PackedImageDescRelease(OCIO_PackedImageDesc* id)
 {
 	MEM_freeN(id);
 }
 
-ExponentTransformRcPtr *FallbackImpl::createExponentTransform(void)
+OCIO_ExponentTransformRcPtr *FallbackImpl::createExponentTransform(void)
 {
-	return (ExponentTransformRcPtr*)PROCESSOR_UNKNOWN;
+	return (OCIO_ExponentTransformRcPtr*)PROCESSOR_UNKNOWN;
 }
 
-void FallbackImpl::exponentTransformSetValue(ExponentTransformRcPtr *, const float *)
+void FallbackImpl::exponentTransformSetValue(OCIO_ExponentTransformRcPtr *, const float *)
 {
 }
 
-void FallbackImpl::exponentTransformRelease(ExponentTransformRcPtr *)
+void FallbackImpl::exponentTransformRelease(OCIO_ExponentTransformRcPtr *)
 {
 }
 
-MatrixTransformRcPtr *FallbackImpl::createMatrixTransform(void)
+OCIO_MatrixTransformRcPtr *FallbackImpl::createMatrixTransform(void)
 {
-	return (MatrixTransformRcPtr*)PROCESSOR_UNKNOWN;
+	return (OCIO_MatrixTransformRcPtr*)PROCESSOR_UNKNOWN;
 }
 
-void FallbackImpl::matrixTransformSetValue(MatrixTransformRcPtr *, const float *, const float *)
+void FallbackImpl::matrixTransformSetValue(OCIO_MatrixTransformRcPtr *, const float *, const float *)
 {
 }
 
-void FallbackImpl::matrixTransformRelease(MatrixTransformRcPtr *)
+void FallbackImpl::matrixTransformRelease(OCIO_MatrixTransformRcPtr *)
 {
 }