iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed unused vars from colorpicker dialog. 

No longer depends on lavc headers when USE_LAVC is undefined.

Originally committed to SVN as r344.
This commit is contained in:
Niels Martin Hansen 2006-04-16 00:10:21 +00:00
parent a58e68f29a
commit 8ad3d1d252
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/dialog_colorpicker.cpp
View File

@ -592,7 +592,7 @@ void DialogColorPicker::UpdateFromRGB()
if (updating_controls) return; if (updating_controls) return;
updating_controls = true; updating_controls = true;
unsigned char r, g, b, y, u, v, h, s, l, h2, s2, v2; unsigned char r, g, b, h, s, l, h2, s2, v2;
r = rgb_input[0]->GetValue(); r = rgb_input[0]->GetValue();
g = rgb_input[1]->GetValue(); g = rgb_input[1]->GetValue();
b = rgb_input[2]->GetValue(); b = rgb_input[2]->GetValue();
@ -619,7 +619,7 @@ void DialogColorPicker::UpdateFromHSL()
if (updating_controls) return; if (updating_controls) return;
updating_controls = true; updating_controls = true;
unsigned char r, g, b, y, u, v, h, s, l, h2, s2, v2; unsigned char r, g, b, h, s, l, h2, s2, v2;
h = hsl_input[0]->GetValue(); h = hsl_input[0]->GetValue();
s = hsl_input[1]->GetValue(); s = hsl_input[1]->GetValue();
l = hsl_input[2]->GetValue(); l = hsl_input[2]->GetValue();
@ -645,7 +645,7 @@ void DialogColorPicker::UpdateFromHSV()
if (updating_controls) return; if (updating_controls) return;
updating_controls = true; updating_controls = true;
unsigned char r, g, b, y, u, v, h, s, l, h2, s2, v2; unsigned char r, g, b, h, s, l, h2, s2, v2;
//int r, g, b, h2, s2, v2; //int r, g, b, h2, s2, v2;
h2 = hsv_input[0]->GetValue(); h2 = hsv_input[0]->GetValue();
s2 = hsv_input[1]->GetValue(); s2 = hsv_input[1]->GetValue();
@ -673,7 +673,7 @@ void DialogColorPicker::UpdateFromASS()
if (updating_controls) return; if (updating_controls) return;
updating_controls = true; updating_controls = true;
unsigned char r, g, b, y, u, v, h, s, l, h2, s2, v2; unsigned char r, g, b, h, s, l, h2, s2, v2;
AssColor ass; AssColor ass;
ass.ParseASS(ass_input->GetValue()); ass.ParseASS(ass_input->GetValue());
r = ass.r; r = ass.r;
@ -703,7 +703,7 @@ void DialogColorPicker::UpdateFromHTML()
if (updating_controls) return; if (updating_controls) return;
updating_controls = true; updating_controls = true;
unsigned char r, g, b, y, u, v, h, s, l, h2, s2, v2; unsigned char r, g, b, h, s, l, h2, s2, v2;
cur_color = html_to_color(html_input->GetValue()); cur_color = html_to_color(html_input->GetValue());
r = cur_color.Red(); r = cur_color.Red();
g = cur_color.Green(); g = cur_color.Green();

2
core/lavc_file.h
View File

@ -38,6 +38,7 @@
#ifndef LAVC_FILE_H #ifndef LAVC_FILE_H
#define LAVC_FILE_H #define LAVC_FILE_H
#ifdef USE_LAVC
#define EMULATE_INTTYPES #define EMULATE_INTTYPES
#include <wx/filename.h> #include <wx/filename.h>
@ -65,5 +66,6 @@ public:
void Release() { if (!--refs) delete this; }; void Release() { if (!--refs) delete this; };
}; };
#endif /* USE_LAVC */
#endif /* LAVC_FILE_H */ #endif /* LAVC_FILE_H */