]> git.sesse.net Git - movit/blobdiff - effect_chain_test.cpp
Increase version number after YADIF.
[movit] / effect_chain_test.cpp
index d79c933431cdaa2d8c5f78924a970748a3f66fa4..32beb41b45df0c4e67c7490f884f3581eb2b2963 100644 (file)
@@ -951,7 +951,7 @@ TEST(EffectChainTest, SameInputsGiveSameOutputs) {
                0.0f, 0.0f,
                0.0f, 0.0f,
        };
-       float out_data[2 * 2];
+       float out_data[4 * 3];
        
        EffectChainTester tester(NULL, 4, 3);  // Note non-square aspect.
 
@@ -1248,7 +1248,12 @@ TEST(EffectChainTest, StringStreamLocalesWork) {
        // the test will always succeed. Note that the OpenGL driver might call
        // setlocale() behind-the-scenes, and that might corrupt the returned
        // pointer, so we need to take our own copy of it here.
-       char *saved_locale = strdup(setlocale(LC_ALL, "nb_NO.UTF_8"));
+       char *saved_locale = setlocale(LC_ALL, "nb_NO.UTF_8");
+       if (saved_locale == NULL) {
+               // The locale wasn't available.
+               return;
+       }
+       saved_locale = strdup(saved_locale);
        float data[] = {
                0.0f, 0.0f, 0.0f, 0.0f,
        };