Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-10 16:33:27 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-10 16:33:27 +0400
commit219eca0f515f9a54953566539520fde37f2ea13b (patch)
tree55032be25b32e59e4281aeb67660e5b48ec861ee /source/blender/makesdna/DNA_color_types.h
parentc27472c04ef294a1de6ab9804c3b87f5635a8fcd (diff)
mango request - add alpha to histogram & sample line.
Diffstat (limited to 'source/blender/makesdna/DNA_color_types.h')
-rw-r--r--source/blender/makesdna/DNA_color_types.h18
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;