diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
index 73701e826..dbbb42e50 100644
--- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -43,7 +43,7 @@
Text, "");
}
static void expand_times(AssDialogue *src, AssDialogue *dst) {
- using std::min;
- using std::max;
- dst->Start.SetMS(min(dst->Start.GetMS(), src->Start.GetMS()));
- dst->End.SetMS(max(dst->End.GetMS(), src->End.GetMS()));
+ dst->Start.SetMS(std::min(dst->Start.GetMS(), src->Start.GetMS()));
+ dst->End.SetMS(std::max(dst->End.GetMS(), src->End.GetMS()));
}
/// @brief Recombine
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index 523864b2b..8a2fde812 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -512,8 +512,7 @@ void VideoDisplay::OnKey(wxKeyEvent &event) {
}
void VideoDisplay::SetZoom(double value) {
- using std::max;
- zoomValue = max(value, .125);
+ zoomValue = std::max(value, .125);
zoomBox->SetValue(wxString::Format("%g%%", zoomValue * 100.));
UpdateSize();
}
diff --git a/aegisub/src/video_out_gl.cpp b/aegisub/src/video_out_gl.cpp
index d69c1cb6b..e078b57ab 100644
--- a/aegisub/src/video_out_gl.cpp
+++ b/aegisub/src/video_out_gl.cpp
@@ -43,9 +43,6 @@
#include
-using std::min;
-using std::max;
-
// These must be included before local headers.
#ifdef __APPLE__
#include
@@ -216,8 +213,8 @@ void VideoOutGL::InitTextures(int width, int height, GLenum format, int bpp, boo
// Width and height of the area read from the frame data
int sourceX = col * textureArea;
int sourceY = row * textureArea;
- ti.sourceW = min(frameWidth - sourceX, maxTextureSize);
- ti.sourceH = min(frameHeight - sourceY, maxTextureSize);
+ ti.sourceW = std::min(frameWidth - sourceX, maxTextureSize);
+ ti.sourceH = std::min(frameHeight - sourceY, maxTextureSize);
// Used instead of GL_PACK_SKIP_ROWS/GL_PACK_SKIP_PIXELS due to
// performance issues with the emulation
@@ -226,7 +223,7 @@ void VideoOutGL::InitTextures(int width, int height, GLenum format, int bpp, boo
int textureHeight = SmallestPowerOf2(ti.sourceH);
int textureWidth = SmallestPowerOf2(ti.sourceW);
if (!supportsRectangularTextures) {
- textureWidth = textureHeight = max(textureWidth, textureHeight);
+ textureWidth = textureHeight = std::max(textureWidth, textureHeight);
}
// Location where this texture is placed
diff --git a/aegisub/src/visual_tool_scale.cpp b/aegisub/src/visual_tool_scale.cpp
index d95da8f91..94be5421f 100644
--- a/aegisub/src/visual_tool_scale.cpp
+++ b/aegisub/src/visual_tool_scale.cpp
@@ -125,7 +125,6 @@ bool VisualToolScale::InitializeHold() {
}
void VisualToolScale::UpdateHold() {
- using std::max;
// Deltas
int deltaX = video.x - startX;
int deltaY = startY - video.y;
@@ -135,8 +134,8 @@ void VisualToolScale::UpdateHold() {
}
// Calculate
- curScaleX = max(deltaX*1.25f + origScaleX, 0.f);
- curScaleY = max(deltaY*1.25f + origScaleY, 0.f);
+ curScaleX = std::max(deltaX*1.25f + origScaleX, 0.f);
+ curScaleY = std::max(deltaY*1.25f + origScaleY, 0.f);
// Oh Snap
if (ctrlDown) {