Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 710612 | Differences between
and this patch

Collapse All | Expand All

(-)a/src/gui/cgp.cpp (-24 / +22 lines)
Lines 74-82 Link Here
74
74
75
		// shader
75
		// shader
76
		key.sprintf("shader%u", i);
76
		key = QString("shader%1").arg(i);
77
		if (cgp_value(set, key, value) == FALSE) {
77
		if (cgp_value(set, key, value) == FALSE) {
78
			value.replace('\\', '/');
78
			value.replace('\\', '/');
79
			ustrncpy(sp->path,uQStringCD(QFileInfo(fi.absolutePath() + '/' + value).absoluteFilePath()),
79
			ustrncpy(sp->path, uQStringCD(QFileInfo(fi.absolutePath() + '/' + value).absoluteFilePath()), usizeof(sp->path) - 1);
80
				usizeof(sp->path) - 1);
81
		} else {
80
		} else {
82
			delete(set);
81
			delete(set);
Lines 85-89 Link Here
85
84
86
		// alias
85
		// alias
87
		key.sprintf("alias%u", i);
86
		key = QString("alias%1").arg(i);
88
		if (cgp_value(set, key, value) == FALSE) {
87
		if (cgp_value(set, key, value) == FALSE) {
89
			::strncpy(sp->alias, qPrintable(value), sizeof(sp->alias) - 1);
88
			::strncpy(sp->alias, qPrintable(value), sizeof(sp->alias) - 1);
Lines 91-95 Link Here
91
90
92
		// mipmap_input
91
		// mipmap_input
93
		key.sprintf("mipmap_input%u", i);
92
		key = QString("mipmap_input%1").arg(i);
94
		if (cgp_value(set, key, value) == FALSE) {
93
		if (cgp_value(set, key, value) == FALSE) {
95
			if (QString::compare(value, "true", Qt::CaseInsensitive) == 0) {
94
			if (QString::compare(value, "true", Qt::CaseInsensitive) == 0) {
Lines 99-103 Link Here
99
98
100
		// filter_linear
99
		// filter_linear
101
		key.sprintf("filter_linear%u", i);
100
		key = QString("filter_linear%1").arg(i);
102
		if (cgp_value(set, key, value) == FALSE) {
101
		if (cgp_value(set, key, value) == FALSE) {
103
			if (QString::compare(value, "false", Qt::CaseInsensitive) == 0) {
102
			if (QString::compare(value, "false", Qt::CaseInsensitive) == 0) {
Lines 109-113 Link Here
109
108
110
		// float_framebuffer
109
		// float_framebuffer
111
		key.sprintf("float_framebuffer%u", i);
110
		key = QString("float_framebuffer%1").arg(i);
112
		if (cgp_value(set, key, value) == FALSE) {
111
		if (cgp_value(set, key, value) == FALSE) {
113
			if (QString::compare(value, "true", Qt::CaseInsensitive) == 0) {
112
			if (QString::compare(value, "true", Qt::CaseInsensitive) == 0) {
Lines 117-121 Link Here
117
116
118
		// srgb_framebuffer
117
		// srgb_framebuffer
119
		key.sprintf("srgb_framebuffer%u", i);
118
		key = QString("srgb_framebuffer%1").arg(i);
120
		if (cgp_value(set, key, value) == FALSE) {
119
		if (cgp_value(set, key, value) == FALSE) {
121
			if (QString::compare(value, "true", Qt::CaseInsensitive) == 0) {
120
			if (QString::compare(value, "true", Qt::CaseInsensitive) == 0) {
Lines 125-129 Link Here
125
124
126
		// frame_count_mod
125
		// frame_count_mod
127
		key.sprintf("frame_count_mod%u", i);
126
		key = QString("frame_count_mod%1").arg(i);
128
		if (cgp_value(set, key, value) == FALSE) {
127
		if (cgp_value(set, key, value) == FALSE) {
129
			sp->frame_count_mod = value.toFloat();
128
			sp->frame_count_mod = value.toFloat();
Lines 131-135 Link Here
131
130
132
		// wrap_mode
131
		// wrap_mode
133
		key.sprintf("wrap_mode%u", i);
132
		key = QString("wrap_mode%1").arg(i);
134
		if (cgp_value(set, key, value) == FALSE) {
133
		if (cgp_value(set, key, value) == FALSE) {
135
			if (QString::compare(value, "clamp_to_border", Qt::CaseInsensitive) == 0) {
134
			if (QString::compare(value, "clamp_to_border", Qt::CaseInsensitive) == 0) {
Lines 153-165 Link Here
153
			_shader_scale *sc = &sp->sc;
152
			_shader_scale *sc = &sp->sc;
154
153
155
			sc_type.sprintf("scale_type%u", i);
154
			sc_type = QString("scale_type%1").arg(i);
156
			cgp_value(set, sc_type, value);
155
			cgp_value(set, sc_type, value);
157
			sc_type = value;
156
			sc_type = value;
158
157
159
			sc_type_x.sprintf("scale_type_x%u", i);
158
			sc_type_x = QString("scale_type_x%1").arg(i);
160
			cgp_value(set, sc_type_x, value);
159
			cgp_value(set, sc_type_x, value);
161
			sc_type_x = value;
160
			sc_type_x = value;
162
161
163
			sc_type_y.sprintf("scale_type_y%u", i);
162
			sc_type_y = QString("scale_type_y%1").arg(i);
164
			cgp_value(set, sc_type_y, value);
163
			cgp_value(set, sc_type_y, value);
165
			sc_type_y = value;
164
			sc_type_y = value;
Lines 200-209 Link Here
200
199
201
				// x
200
				// x
202
				key.sprintf("scale%u", i);
201
				key = QString("scale%1").arg(i);
203
				if (sc->type.x == SHADER_SCALE_ABSOLUTE) {
202
				if (sc->type.x == SHADER_SCALE_ABSOLUTE) {
204
					if (cgp_value(set, key, value) == FALSE) {
203
					if (cgp_value(set, key, value) == FALSE) {
205
						sc->abs.x = value.toFloat();
204
						sc->abs.x = value.toFloat();
206
					} else {
205
					} else {
207
						key.sprintf("scale_x%u", i);
206
						key = QString("scale_x%1").arg(i);
208
						if (cgp_value(set, key, value) == FALSE) {
207
						if (cgp_value(set, key, value) == FALSE) {
209
							sc->abs.x = value.toFloat();
208
							sc->abs.x = value.toFloat();
Lines 214-218 Link Here
214
						sc->scale.x = value.toFloat();
213
						sc->scale.x = value.toFloat();
215
					} else {
214
					} else {
216
						key.sprintf("scale_x%u", i);
215
						key = QString("scale_x%1").arg(i);
217
						if (cgp_value(set, key, value) == FALSE) {
216
						if (cgp_value(set, key, value) == FALSE) {
218
							sc->scale.x = value.toFloat();
217
							sc->scale.x = value.toFloat();
Lines 222-231 Link Here
222
221
223
				// y
222
				// y
224
				key.sprintf("scale%u", i);
223
				key = QString("scale%1").arg(i);
225
				if (sc->type.y == SHADER_SCALE_ABSOLUTE) {
224
				if (sc->type.y == SHADER_SCALE_ABSOLUTE) {
226
					if (cgp_value(set, key, value) == FALSE) {
225
					if (cgp_value(set, key, value) == FALSE) {
227
						sc->abs.y = value.toFloat();
226
						sc->abs.y = value.toFloat();
228
					} else {
227
					} else {
229
						key.sprintf("scale_y%u", i);
228
						key = QString("scale_y%1").arg(i);
230
						if (cgp_value(set, key, value) == FALSE) {
229
						if (cgp_value(set, key, value) == FALSE) {
231
							sc->abs.y = value.toFloat();
230
							sc->abs.y = value.toFloat();
Lines 236-240 Link Here
236
						sc->scale.y = value.toFloat();
235
						sc->scale.y = value.toFloat();
237
					} else {
236
					} else {
238
						key.sprintf("scale_y%u", i);
237
						key = QString("scale_y%1").arg(i);
239
						if (cgp_value(set, key, value) == FALSE) {
238
						if (cgp_value(set, key, value) == FALSE) {
240
							sc->scale.y = value.toFloat();
239
							sc->scale.y = value.toFloat();
Lines 250-254 Link Here
250
		list = value.split(';');
249
		list = value.split(';');
251
250
252
		foreach (const QString &ele, list){
251
		foreach (const QString &ele, list) {
253
			_lut_pass *lp;
252
			_lut_pass *lp;
254
253
Lines 275-280 Link Here
275
			if (cgp_value(set, ele, value) == FALSE) {
274
			if (cgp_value(set, ele, value) == FALSE) {
276
				value.replace('\\', '/');
275
				value.replace('\\', '/');
277
				ustrncpy(lp->path, uQStringCD(QFileInfo(fi.absolutePath() + '/' + value).absoluteFilePath()),
276
				ustrncpy(lp->path, uQStringCD(QFileInfo(fi.absolutePath() + '/' + value).absoluteFilePath()), usizeof(lp->path) - 1);
278
					usizeof(lp->path) - 1);
279
			}
277
			}
280
278
Lines 321-325 Link Here
321
		list = value.split(';');
319
		list = value.split(';');
322
320
323
		foreach (const QString &ele, list){
321
		foreach (const QString &ele, list) {
324
			_param_shd *prm;
322
			_param_shd *prm;
325
323
Lines 385-389 Link Here
385
			}
383
			}
386
384
387
			line = line.remove(QRegExp( "#pragma parameter.*\"" ) );
385
			line = line.remove(QRegExp("#pragma parameter.*\""));
388
386
389
			while ((pos = rx.indexIn(line, pos)) != -1) {
387
			while ((pos = rx.indexIn(line, pos)) != -1) {

Return to bug 710612