From 72574b959c39981033069e367a12c5ae595dd93a Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 16 Jan 2002 16:04:50 +0000
Subject: added another test in regions_overlap() (Klaus)

---
 src/mesa/swrast/s_copypix.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/mesa')

diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index d2d93a944d..7ed59ab7d4 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -1,10 +1,10 @@
-/* $Id: s_copypix.c,v 1.27 2002/01/10 16:54:29 brianp Exp $ */
+/* $Id: s_copypix.c,v 1.28 2002/01/16 16:04:50 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -67,6 +67,9 @@ regions_overlap(GLint srcx, GLint srcy,
       else if (srcy < dsty) { /* this is OK */
          return GL_FALSE;
       }
+      else if (srcy > dsty + height) {
+         return GL_FALSE;
+      }
       else {
          return GL_TRUE;
       }
-- 
cgit v1.2.3