diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2013-09-04 15:12:37 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2013-09-04 15:12:37 +0000 |
| commit | 7844495624be79259e613182e6a615319b2f4376 (patch) | |
| tree | 8656b9339174ab9061b42be2b50c2d9563401c8a /otherlibs/graph/color.c | |
| parent | e9723139769a4df610fadba0fdeecab298c1c17e (diff) | |
Merge branch 4.01 from branching point to 4.01.0+rc1
Command line used:
svn merge --accept postpone -r 13776:14055 $REPO/version/4.01 .
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14060 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/graph/color.c')
| -rw-r--r-- | otherlibs/graph/color.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/otherlibs/graph/color.c b/otherlibs/graph/color.c index 02641ae8e..5b9406052 100644 --- a/otherlibs/graph/color.c +++ b/otherlibs/graph/color.c @@ -97,7 +97,8 @@ void caml_gr_init_direct_rgb_to_pixel(void) fprintf(stderr, "green %d %d\n", caml_gr_green_l, caml_gr_green_r); #endif for(i=0; i<256; i++){ - caml_gr_green_vals[i] = (((i << 8) + i) >> caml_gr_green_r) << caml_gr_green_l; + caml_gr_green_vals[i] = + (((i << 8) + i) >> caml_gr_green_r) << caml_gr_green_l; } caml_gr_get_shifts(caml_gr_blue_mask, &caml_gr_blue_l, &caml_gr_blue_r); @@ -105,7 +106,8 @@ void caml_gr_init_direct_rgb_to_pixel(void) fprintf(stderr, "blue %d %d\n", caml_gr_blue_l, caml_gr_blue_r); #endif for(i=0; i<256; i++){ - caml_gr_blue_vals[i] = (((i << 8) + i) >> caml_gr_blue_r) << caml_gr_blue_l; + caml_gr_blue_vals[i] = + (((i << 8) + i) >> caml_gr_blue_r) << caml_gr_blue_l; } if( caml_gr_red_l < 0 || caml_gr_red_r < 0 || @@ -189,9 +191,12 @@ int caml_gr_rgb_pixel(long unsigned int pixel) int i; if (caml_gr_direct_rgb) { - r = (((pixel & caml_gr_red_mask) >> caml_gr_red_l) << 8) >> (16 - caml_gr_red_r); - g = (((pixel & caml_gr_green_mask) >> caml_gr_green_l) << 8) >> (16 - caml_gr_green_r); - b = (((pixel & caml_gr_blue_mask) >> caml_gr_blue_l) << 8) >> (16 - caml_gr_blue_r); + r = (((pixel & caml_gr_red_mask) >> caml_gr_red_l) << 8) + >> (16 - caml_gr_red_r); + g = (((pixel & caml_gr_green_mask) >> caml_gr_green_l) << 8) + >> (16 - caml_gr_green_r); + b = (((pixel & caml_gr_blue_mask) >> caml_gr_blue_l) << 8) + >> (16 - caml_gr_blue_r); return (r << 16) + (g << 8) + b; } |