[PATCH 6/7] mi: Remove miPolyFillRect
Adam Jackson
ajax at redhat.com
Wed Oct 8 05:17:18 PDT 2014
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
doc/Xserver-spec.xml | 4 +-
mi/Makefile.am | 1 -
mi/mi.h | 8 ----
mi/mifillrct.c | 132 ---------------------------------------------------
4 files changed, 2 insertions(+), 143 deletions(-)
delete mode 100644 mi/mifillrct.c
diff --git a/doc/Xserver-spec.xml b/doc/Xserver-spec.xml
index 4c34419..3d5c069 100644
--- a/doc/Xserver-spec.xml
+++ b/doc/Xserver-spec.xml
@@ -4229,8 +4229,8 @@ An example implementation is miFillPolygon() in Xserver/mi/mipoly.c.</para>
</programlisting></blockquote>
PolyFillRect fills multiple rectangles.</para>
<para>
-Example implementations are fbPolyFillRect() in Xserver/fb/fbfillrect.c and
-miPolyFillRect() in Xserver/mi/mifillrct.c.</para>
+An example implementations is fbPolyFillRect() in Xserver/fb/fbfillrect.c.
+</para>
<para>
<blockquote><programlisting>
diff --git a/mi/Makefile.am b/mi/Makefile.am
index 0cef779..407900a 100644
--- a/mi/Makefile.am
+++ b/mi/Makefile.am
@@ -23,7 +23,6 @@ libmi_la_SOURCES = \
miexpose.c \
mifillarc.c \
mifillarc.h \
- mifillrct.c \
mifpolycon.c \
mifpoly.h \
migc.c \
diff --git a/mi/mi.h b/mi/mi.h
index 48bc272..356f494 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -225,14 +225,6 @@ extern _X_EXPORT void miClearDrawable(DrawablePtr /*pDraw */ ,
GCPtr /*pGC */
);
-/* mifillrct.c */
-
-extern _X_EXPORT void miPolyFillRect(DrawablePtr /*pDrawable */ ,
- GCPtr /*pGC */ ,
- int /*nrectFill */ ,
- xRectangle * /*prectInit */
- );
-
/* miglblt.c */
extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr pDrawable,
diff --git a/mi/mifillrct.c b/mi/mifillrct.c
deleted file mode 100644
index 79c4057..0000000
--- a/mi/mifillrct.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/X.h>
-#include <X11/Xprotostr.h>
-#include "gcstruct.h"
-#include "windowstr.h"
-#include "pixmap.h"
-#include "mi.h"
-#include "misc.h"
-
-/* mi rectangles
- written by newman, with debts to all and sundry
-*/
-
-/* MIPOLYFILLRECT -- public entry for PolyFillRect request
- * very straight forward: translate rectangles if necessary
- * then call FillSpans to fill each rectangle. We let FillSpans worry about
- * clipping to the destination
- */
-void
-miPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, /* number of rectangles to fill */
- xRectangle *prectInit /* Pointer to first rectangle to fill */
- )
-{
- int i;
- int height;
- int width;
- xRectangle *prect;
- int xorg;
- int yorg;
- int maxheight;
- DDXPointPtr pptFirst;
- DDXPointPtr ppt;
- int *pwFirst;
- int *pw;
-
- if (pGC->miTranslate) {
- xorg = pDrawable->x;
- yorg = pDrawable->y;
- prect = prectInit;
- maxheight = 0;
- for (i = 0; i < nrectFill; i++, prect++) {
- prect->x += xorg;
- prect->y += yorg;
- maxheight = max(maxheight, prect->height);
- }
- }
- else {
- prect = prectInit;
- maxheight = 0;
- for (i = 0; i < nrectFill; i++, prect++)
- maxheight = max(maxheight, prect->height);
- }
-
- pptFirst = malloc(maxheight * sizeof(DDXPointRec));
- pwFirst = malloc(maxheight * sizeof(int));
- if (!pptFirst || !pwFirst) {
- free(pwFirst);
- free(pptFirst);
- return;
- }
-
- prect = prectInit;
- while (nrectFill--) {
- ppt = pptFirst;
- pw = pwFirst;
- height = prect->height;
- width = prect->width;
- xorg = prect->x;
- yorg = prect->y;
- while (height--) {
- *pw++ = width;
- ppt->x = xorg;
- ppt->y = yorg;
- ppt++;
- yorg++;
- }
- (*pGC->ops->FillSpans) (pDrawable, pGC,
- prect->height, pptFirst, pwFirst, 1);
- prect++;
- }
- free(pwFirst);
- free(pptFirst);
-}
--
1.9.3
More information about the xorg-devel
mailing list