comparison src/gui_w32.c @ 8108:50515f2e81d1 v7.4.1348

commit https://github.com/vim/vim/commit/7f0608fb5219645d776fadfe13efb867c2460698 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Feb 18 20:46:39 2016 +0100 patch 7.4.1348 Problem: More compiler warnings. (John Marriott) Solution: Add type casts, remove unused variable.
author Christian Brabandt <cb@256bit.org>
date Thu, 18 Feb 2016 21:00:07 +0100
parents 441298d72f3c
children f52504c10387
comparison
equal deleted inserted replaced
8107:925df1bbc05c 8108:50515f2e81d1
55 #if defined(FEAT_RENDER_OPTIONS) || defined(PROTO) 55 #if defined(FEAT_RENDER_OPTIONS) || defined(PROTO)
56 int 56 int
57 gui_mch_set_rendering_options(char_u *s) 57 gui_mch_set_rendering_options(char_u *s)
58 { 58 {
59 #ifdef FEAT_DIRECTX 59 #ifdef FEAT_DIRECTX
60 int retval = FAIL;
61 char_u *p, *q; 60 char_u *p, *q;
62 61
63 int dx_enable = 0; 62 int dx_enable = 0;
64 int dx_flags = 0; 63 int dx_flags = 0;
65 float dx_gamma = 0.0f; 64 float dx_gamma = 0.0f;
93 return FAIL; 92 return FAIL;
94 } 93 }
95 else if (STRCMP(name, "gamma") == 0) 94 else if (STRCMP(name, "gamma") == 0)
96 { 95 {
97 dx_flags |= 1 << 0; 96 dx_flags |= 1 << 0;
98 dx_gamma = (float)atof(value); 97 dx_gamma = (float)atof((char *)value);
99 } 98 }
100 else if (STRCMP(name, "contrast") == 0) 99 else if (STRCMP(name, "contrast") == 0)
101 { 100 {
102 dx_flags |= 1 << 1; 101 dx_flags |= 1 << 1;
103 dx_contrast = (float)atof(value); 102 dx_contrast = (float)atof((char *)value);
104 } 103 }
105 else if (STRCMP(name, "level") == 0) 104 else if (STRCMP(name, "level") == 0)
106 { 105 {
107 dx_flags |= 1 << 2; 106 dx_flags |= 1 << 2;
108 dx_level = (float)atof(value); 107 dx_level = (float)atof((char *)value);
109 } 108 }
110 else if (STRCMP(name, "geom") == 0) 109 else if (STRCMP(name, "geom") == 0)
111 { 110 {
112 dx_flags |= 1 << 3; 111 dx_flags |= 1 << 3;
113 dx_geom = atoi(value); 112 dx_geom = atoi((char *)value);
114 if (dx_geom < 0 || dx_geom > 2) 113 if (dx_geom < 0 || dx_geom > 2)
115 return FAIL; 114 return FAIL;
116 } 115 }
117 else if (STRCMP(name, "renmode") == 0) 116 else if (STRCMP(name, "renmode") == 0)
118 { 117 {
119 dx_flags |= 1 << 4; 118 dx_flags |= 1 << 4;
120 dx_renmode = atoi(value); 119 dx_renmode = atoi((char *)value);
121 if (dx_renmode < 0 || dx_renmode > 6) 120 if (dx_renmode < 0 || dx_renmode > 6)
122 return FAIL; 121 return FAIL;
123 } 122 }
124 else if (STRCMP(name, "taamode") == 0) 123 else if (STRCMP(name, "taamode") == 0)
125 { 124 {
126 dx_flags |= 1 << 5; 125 dx_flags |= 1 << 5;
127 dx_taamode = atoi(value); 126 dx_taamode = atoi((char *)value);
128 if (dx_taamode < 0 || dx_taamode > 3) 127 if (dx_taamode < 0 || dx_taamode > 3)
129 return FAIL; 128 return FAIL;
130 } 129 }
131 else 130 else
132 return FAIL; 131 return FAIL;