diff options
Diffstat (limited to '')
-rw-r--r-- | minui/resources.cpp | 2 | ||||
-rw-r--r-- | tests/testdata/battery_scale.png | bin | 0 -> 463 bytes | |||
-rw-r--r-- | tests/unit/resources_test.cpp | 37 |
3 files changed, 38 insertions, 1 deletions
diff --git a/minui/resources.cpp b/minui/resources.cpp index c7af1904d..057d3fd03 100644 --- a/minui/resources.cpp +++ b/minui/resources.cpp @@ -261,7 +261,7 @@ int res_create_multi_display_surface(const char* name, int* frames, int* fps, for (int i = 0; i < *frames; ++i) { auto height_per_frame = height / *frames; auto created_surface = - GRSurface::Create(width, height_per_frame, width * 4, 4, width * height_per_frame); + GRSurface::Create(width, height_per_frame, width * 4, 4, width * height_per_frame * 4); if (!created_surface) { result = -8; goto exit; diff --git a/tests/testdata/battery_scale.png b/tests/testdata/battery_scale.png Binary files differnew file mode 100644 index 000000000..2ae8f0fd7 --- /dev/null +++ b/tests/testdata/battery_scale.png diff --git a/tests/unit/resources_test.cpp b/tests/unit/resources_test.cpp new file mode 100644 index 000000000..c3f72718f --- /dev/null +++ b/tests/unit/resources_test.cpp @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <string> + +#include <gtest/gtest.h> + +#include "common/test_constants.h" +#include "minui/minui.h" + +TEST(ResourcesTest, res_create_multi_display_surface) { + GRSurface** frames; + int frame_count; + int fps; + ASSERT_EQ(0, res_create_multi_display_surface(from_testdata_base("battery_scale.png").c_str(), + &frame_count, &fps, &frames)); + ASSERT_EQ(6, frame_count); + ASSERT_EQ(20, fps); + + for (auto i = 0; i < frame_count; i++) { + free(frames[i]); + } + free(frames); +} |