From: Pierre Joye <pajoye@php.net>
Date: Sun, 17 Jun 2007 17:12:46 +0000 (+0000)
Subject: - MFB: Drop useless tests (Daniel Diaz)
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~438
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd8baff90a510123c3dc0cbe031436263bd218e8;p=php

- MFB: Drop useless tests (Daniel Diaz)
---

diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c
index c4ba69fe13..5d64e0b640 100644
--- a/ext/gd/libgd/gd.c
+++ b/ext/gd/libgd/gd.c
@@ -3610,9 +3610,7 @@ int gdImageNegate(gdImagePtr src)
 			if (new_pxl == -1) {
 				new_pxl = gdImageColorClosestAlpha(src, 255-r, 255-g, 255-b, a);
 			}
-			if ((y >= 0) && (y < src->sy)) {
-				gdImageSetPixel (src, x, y, new_pxl);
-			}
+			gdImageSetPixel (src, x, y, new_pxl);
 		}
 	}
 	return 1;
@@ -3645,9 +3643,7 @@ int gdImageGrayScale(gdImagePtr src)
 			if (new_pxl == -1) {
 				new_pxl = gdImageColorClosestAlpha(src, r, g, b, a);
 			}
-			if ((y >= 0) && (y < src->sy)) {
-				gdImageSetPixel (src, x, y, new_pxl);
-			}
+			gdImageSetPixel (src, x, y, new_pxl);
 		}
 	}
 	return 1;
@@ -3692,9 +3688,7 @@ int gdImageBrightness(gdImagePtr src, int brightness)
 			if (new_pxl == -1) {
 				new_pxl = gdImageColorClosestAlpha(src, (int)r, (int)g, (int)b, a);
 			}
-			if ((y >= 0) && (y < src->sy)) {
-				gdImageSetPixel (src, x, y, new_pxl);
-			}
+			gdImageSetPixel (src, x, y, new_pxl);
 		}
 	}
 	return 1;
@@ -3754,9 +3748,7 @@ int gdImageContrast(gdImagePtr src, double contrast)
 			if (new_pxl == -1) {
 				new_pxl = gdImageColorClosestAlpha(src, (int)rf, (int)gf, (int)bf, a);
 			}
-			if ((y >= 0) && (y < src->sy)) {
-				gdImageSetPixel (src, x, y, new_pxl);
-			}
+			gdImageSetPixel (src, x, y, new_pxl);
 		}
 	}
 	return 1;
@@ -3797,9 +3789,7 @@ int gdImageColor(gdImagePtr src, int red, int green, int blue)
 			if (new_pxl == -1) {
 				new_pxl = gdImageColorClosestAlpha(src, (int)r, (int)g, (int)b, a);
 			}
-			if ((y >= 0) && (y < src->sy)) {
-				gdImageSetPixel (src, x, y, new_pxl);
-			}
+			gdImageSetPixel (src, x, y, new_pxl);
 		}
 	}
 	return 1;
@@ -3855,9 +3845,7 @@ int gdImageConvolution(gdImagePtr src, float filter[3][3], float filter_div, flo
 			if (new_pxl == -1) {
 				new_pxl = gdImageColorClosestAlpha(src, (int)new_r, (int)new_g, (int)new_b, new_a);
 			}
-			if ((y >= 0) && (y < src->sy)) {
-				gdImageSetPixel (src, x, y, new_pxl);
-			}
+			gdImageSetPixel (src, x, y, new_pxl);
 		}
 	}
 	gdImageDestroy(srcback);
@@ -3977,9 +3965,7 @@ int gdImageSelectiveBlur( gdImagePtr src)
 			if (new_pxl == -1) {
 				new_pxl = gdImageColorClosestAlpha(src, (int)new_r, (int)new_g, (int)new_b, new_a);
 			}
-			if ((y >= 0) && (y < src->sy)) {
-				gdImageSetPixel (src, x, y, new_pxl);
-			}
+			gdImageSetPixel (src, x, y, new_pxl);
 		}
 	}
 	gdImageDestroy(srcback);