From 15999f14f146b5c04fb40b31b69ceeeece273430 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 27 Jan 2014 10:08:14 +0100 Subject: Add Image::mipmap to support mipmapping of images. [ChangeLog][QtQuick] New feature: Image.mipmap Task-number: QTBUG-19961 Change-Id: I13acb2408d5b126790adaf9d324ad4beda1e3646 Reviewed-by: Michael Brasser --- tests/auto/quick/scenegraph/data/mipmap_large.png | Bin 0 -> 4465 bytes tests/auto/quick/scenegraph/data/mipmap_small.png | Bin 0 -> 170 bytes tests/auto/quick/scenegraph/data/render_Mipmap.qml | 77 +++++++++++++++++++++ tests/auto/quick/scenegraph/tst_scenegraph.cpp | 1 + 4 files changed, 78 insertions(+) create mode 100644 tests/auto/quick/scenegraph/data/mipmap_large.png create mode 100644 tests/auto/quick/scenegraph/data/mipmap_small.png create mode 100644 tests/auto/quick/scenegraph/data/render_Mipmap.qml (limited to 'tests/auto/quick') diff --git a/tests/auto/quick/scenegraph/data/mipmap_large.png b/tests/auto/quick/scenegraph/data/mipmap_large.png new file mode 100644 index 0000000000..9cb0fc7de1 Binary files /dev/null and b/tests/auto/quick/scenegraph/data/mipmap_large.png differ diff --git a/tests/auto/quick/scenegraph/data/mipmap_small.png b/tests/auto/quick/scenegraph/data/mipmap_small.png new file mode 100644 index 0000000000..dc5216fb6c Binary files /dev/null and b/tests/auto/quick/scenegraph/data/mipmap_small.png differ diff --git a/tests/auto/quick/scenegraph/data/render_Mipmap.qml b/tests/auto/quick/scenegraph/data/render_Mipmap.qml new file mode 100644 index 0000000000..0a6195fc1f --- /dev/null +++ b/tests/auto/quick/scenegraph/data/render_Mipmap.qml @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.3 + +/* + The test verifies that scaled down mipmapped images contains + colors from all pixels. + + #samples: 2 + PixelPos R G B Error-tolerance + #final: 0 0 0.33 0.33 0.33 0.1 + #final: 1 0 0.33 0.33 0.33 0.1 +*/ + +RenderTestBase +{ + Image { + x: 0 + y: 0 + transformOrigin: Item.TopLeft + source: "mipmap_small.png" + mipmap: true + smooth: false + scale: 1 / width; + } + + Image { + x: 1 + y: 0 + transformOrigin: Item.TopLeft + source: "mipmap_large.png" + mipmap: true + smooth: false + scale: 1 / width; + } + + onEnterFinalStage: finalStageComplete = true; +} diff --git a/tests/auto/quick/scenegraph/tst_scenegraph.cpp b/tests/auto/quick/scenegraph/tst_scenegraph.cpp index 780d5a97db..af5acde5f3 100644 --- a/tests/auto/quick/scenegraph/tst_scenegraph.cpp +++ b/tests/auto/quick/scenegraph/tst_scenegraph.cpp @@ -326,6 +326,7 @@ void tst_SceneGraph::render_data() << "data/render_BreakOpacityBatch.qml" << "data/render_OutOfFloatRange.qml" << "data/render_StackingOrder.qml" + << "data/render_Mipmap.qml" ; QRegExp sampleCount("#samples: *(\\d+)"); -- cgit v1.2.3