Fix a typo.

[nageru] / flow.cpp

diff --git a/flow.cpp b/flow.cpp
index 79b191623f1b03f2512b1a4d428ba115ab9cc6eb..5456d45121bdd8fafcf3c9e3e36890a0f9a12a87 100644 (file)
--- a/flow.cpp
+++ b/flow.cpp
@@ -898,7 +898,7 @@ private:
        bool ended = false;
 };
 
-int main(void)
+int main(int argc, char **argv)
 {
        if (SDL_Init(SDL_INIT_EVERYTHING) == -1) {
                fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
@@ -923,8 +923,8 @@ int main(void)
 
        // Load pictures.
        unsigned width1, height1, width2, height2;
-       GLuint tex0 = load_texture("test1499.png", &width1, &height1);
-       GLuint tex1 = load_texture("test1500.png", &width2, &height2);
+       GLuint tex0 = load_texture(argc >= 2 ? argv[1] : "test1499.png", &width1, &height1);
+       GLuint tex1 = load_texture(argc >= 3 ? argv[2] : "test1500.png", &width2, &height2);
 
        if (width1 != width2 || height1 != height2) {
                fprintf(stderr, "Image dimensions don't match (%dx%d versus %dx%d)\n",
@@ -1133,7 +1133,7 @@ int main(void)
                // Add the differential flow found by the variational refinement to the base flow,
                // giving the final flow estimate for this level.
                // The output is in diff_flow_tex; we don't need to make a new texture.
-               // You can comment out this prat if you wish to test disabling of the variational refinement.
+               // You can comment out this part if you wish to test disabling of the variational refinement.
                {
                        ScopedTimer timer("Add differential flow", &varref_timer);
                        add_base_flow.exec(base_flow_tex, du_dv_tex, level_width, level_height);