92554257b9
graphics/nxbe/nxbe_bitmap.c: Fix another coordinate system problem.
graphics/: Review use of device coordinate system with window frambebuffer and make fixes accordingly.
graphics/nxbe/nxbe_fill.c: Fix a coordinate system bug. Was trying to update the window fraembuffer using the device coordinate system. Need to use the relative coordinate system.
graphics/: Use DEBUGASSERT instead of return an error since the is no user to handle the errors within the NX server. Use CONFIG_DEBUG_GRAPHICS instead of CONFIG_DEBUG_FEATURES in most cases.
graphics/: Nothing under graphics/ should set the errno.
67 lines
2.8 KiB
C
67 lines
2.8 KiB
C
/****************************************************************************
|
|
* libs/libnx/nxglib/nxglib_rectunion.c
|
|
*
|
|
* Copyright (C) 2008-2011, 2013 Gregory Nutt. All rights reserved.
|
|
* Author: Gregory Nutt <gnutt@nuttx.org>
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* 3. Neither the name NuttX nor the names of its contributors may be
|
|
* used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
|
|
#include <nuttx/nx/nxglib.h>
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: nxgl_rectunion
|
|
*
|
|
* Description:
|
|
* Given two rectanges, src1 and src2, return the larger rectangle that
|
|
* contains both, dest.
|
|
*
|
|
****************************************************************************/
|
|
|
|
void nxgl_rectunion(FAR struct nxgl_rect_s *dest,
|
|
FAR const struct nxgl_rect_s *src1,
|
|
FAR const struct nxgl_rect_s *src2)
|
|
{
|
|
dest->pt1.x = ngl_min(src1->pt1.x, src2->pt1.x);
|
|
dest->pt1.y = ngl_min(src1->pt1.y, src2->pt1.y);
|
|
dest->pt2.x = ngl_max(src1->pt2.x, src2->pt2.x);
|
|
dest->pt2.y = ngl_max(src1->pt2.y, src2->pt2.y);
|
|
}
|
|
|