sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for inline functions of new cineon library

Browse Source
This commit is contained in:
Sergey Sharybin 2012-10-22 14:28:43 +00:00
parent 40da6bb531
commit fc5da14dad
2 changed files with 71 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
source/blender/imbuf/intern/cineon/logImageCore.c
View File

@ -1429,77 +1429,3 @@ static int convertRGBAToLogElement(float *src, float *dst, LogImageFile *logImag
return rvalue; return rvalue;
} }
/*
* Endianness swapping
*/
inline unsigned short swap_ushort(unsigned short x, int swap)
{
if (swap != 0)
return (x >> 8) | (x << 8);
else
return x;
}
inline unsigned int swap_uint(unsigned int x, int swap)
{
if (swap != 0)
return (x >> 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) | (x << 24);
else
return x;
}
inline float swap_float(float x, int swap)
{
if (swap != 0) {
union {
float f;
unsigned char b[4];
} dat1, dat2;
dat1.f = x;
dat2.b[0] = dat1.b[3];
dat2.b[1] = dat1.b[2];
dat2.b[2] = dat1.b[1];
dat2.b[3] = dat1.b[0];
return dat2.f;
}
else
return x;
}
/*
* Other
*/
inline unsigned int clamp_uint(unsigned int x, unsigned int low, unsigned int high)
{
if (x > high)
return high;
else if (x < low)
return low;
else
return x;
}
inline float clamp_float(float x, float low, float high)
{
if (x > high)
return high;
else if (x < low)
return low;
else
return x;
}
inline unsigned int float_uint(float value, unsigned int max)
{
if (value < 0.0f)
return 0;
else if (value > (1.0f - 0.5f / (float)max))
return max;
else
return (unsigned int)(((float)max * value) + 0.5f);
}

78
source/blender/imbuf/intern/cineon/logImageCore.h
View File

@ -36,6 +36,7 @@
#include <stdio.h> #include <stdio.h>
#include "BLO_sys_types.h" #include "BLO_sys_types.h"
#include "BLI_utildefines.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -201,15 +202,78 @@ unsigned int getRowLength(int width, LogImageElement logElement);
int logImageSetDataRGBA(LogImageFile *logImage, float *data, int dataIsLinearRGB); int logImageSetDataRGBA(LogImageFile *logImage, float *data, int dataIsLinearRGB);
int logImageGetDataRGBA(LogImageFile *logImage, float *data, int dataIsLinearRGB); int logImageGetDataRGBA(LogImageFile *logImage, float *data, int dataIsLinearRGB);
/* Endianness conversion */ /*
inline unsigned short swap_ushort(unsigned short x, int swap); * Inline routines
inline unsigned int swap_uint(unsigned int x, int swap); */
inline float swap_float(float x, int swap);
/* Endianness swapping */
BLI_INLINE unsigned short swap_ushort(unsigned short x, int swap)
{
if (swap != 0)
return (x >> 8) | (x << 8);
else
return x;
}
BLI_INLINE unsigned int swap_uint(unsigned int x, int swap)
{
if (swap != 0)
return (x >> 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) | (x << 24);
else
return x;
}
BLI_INLINE float swap_float(float x, int swap)
{
if (swap != 0) {
union {
float f;
unsigned char b[4];
} dat1, dat2;
dat1.f = x;
dat2.b[0] = dat1.b[3];
dat2.b[1] = dat1.b[2];
dat2.b[2] = dat1.b[1];
dat2.b[3] = dat1.b[0];
return dat2.f;
}
else
return x;
}
/* Other */ /* Other */
inline float clamp_float(float x, float low, float high);
inline unsigned int clamp_uint(unsigned int x, unsigned int low, unsigned int high); BLI_INLINE unsigned int clamp_uint(unsigned int x, unsigned int low, unsigned int high)
inline unsigned int float_uint(float value, unsigned int max); {
if (x > high)
return high;
else if (x < low)
return low;
else
return x;
}
BLI_INLINE float clamp_float(float x, float low, float high)
{
if (x > high)
return high;
else if (x < low)
return low;
else
return x;
}
BLI_INLINE unsigned int float_uint(float value, unsigned int max)
{
if (value < 0.0f)
return 0;
else if (value > (1.0f - 0.5f / (float)max))
return max;
else
return (unsigned int)(((float)max * value) + 0.5f);
}
#ifdef __cplusplus #ifdef __cplusplus