diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-10 16:37:41 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-10 16:37:41 +0400 |
| commit | fee1db86d32abe4d2dd87a9e397bcf3967bef906 (patch) | |
| tree | 89350f983372b9d81de98ab39118c4cfad3c2d7f /source/blender/makesdna | |
| parent | 189f16362d7d0aad7d66828a800c1f8cda65093a (diff) | |
| parent | 219eca0f515f9a54953566539520fde37f2ea13b (diff) | |
Merging r47674 through r47676 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_color_types.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h index dd2b38ffcf5..99e2a123fe7 100644 --- a/source/blender/makesdna/DNA_color_types.h +++ b/source/blender/makesdna/DNA_color_types.h @@ -96,11 +96,14 @@ typedef enum CurveMappingPreset { } CurveMappingPreset; /* histogram->mode */ -#define HISTO_MODE_LUMA 0 -#define HISTO_MODE_RGB 1 -#define HISTO_MODE_R 2 -#define HISTO_MODE_G 3 -#define HISTO_MODE_B 4 +enum { + HISTO_MODE_LUMA = 0, + HISTO_MODE_RGB = 1, + HISTO_MODE_R = 2, + HISTO_MODE_G = 3, + HISTO_MODE_B = 4, + HISTO_MODE_ALPHA = 5 +}; enum { HISTO_FLAG_LINE = (1 << 0), @@ -110,17 +113,18 @@ enum { typedef struct Histogram { int channels; int x_resolution; + float data_luma[256]; float data_r[256]; float data_g[256]; float data_b[256]; - float data_luma[256]; + float data_a[256]; float xmax, ymax; short mode; short flag; int height; /* sample line only */ - /* image coords src -> est */ + /* image coords src -> dst */ float co[2][2]; } Histogram; |